Compile fix on Linux.

[qt-creator-jp/qt-creator-jp.git] / README

diff --git a/README b/README
index 0c833ce..fbae360 100644 (file)
--- a/README
+++ b/README
@@ -54,7 +54,7 @@ can fix this by either re-building your Qt with the "-developer-build"
 configure option, or by passing the include directory in the source directory
 to qmake. For example:
 
-  qmake "QT_PRIVATE_HEADERS=$$QT_SOURCE_TREE/include" $SOURCE_DIRECTORY/qtcreator.pro
+  qmake "QT_PRIVATE_HEADERS=$$QT_BUILD_TREE/include" $SOURCE_DIRECTORY/qtcreator.pro
 
 
 Compiling Qt and Qt Creator on Windows
@@ -102,7 +102,7 @@ SDK (release builds of Qt using MinGW and Visual C++ 2008).
 
          When using Visual C++ 2010, you must apply a hotfix that is available
          from http://support.microsoft.com/kb/2280741
-         (See http://bugreports.qt.nokia.com/browse/QTBUG-11445).
+         (See https://bugreports.qt.nokia.com/browse/QTBUG-11445).
 
          For the Visual C++ compilers, it is recommended to use the tool 'jom'.
          It is a replacement for nmake that utilizes all CPU cores and thus
@@ -182,8 +182,28 @@ we thank the authors who made this possible:
 * Open Source front-end for C++ (license MIT), enhanced for use in Qt Creator
 
   Roberto Raggi <roberto.raggi@gmail.com>
+
   QtCreator/src/shared/cplusplus
 
+  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 * Botan, a C++ crypto library. Version 1.8.8
 
   Copyright (C) 1999-2004 The Botan Project. All rights reserved.
@@ -227,6 +247,7 @@ we thank the authors who made this possible:
   The source code of Botan C++ crypto library can be found in
   QtCreator/src/libs/3rdparty
 
+
 * NetSieben SSH Library is a Secure Shell client library for C++. Version 1.3.2
 
   Commercial License: For organizations who do not want to release the source
@@ -247,3 +268,46 @@ we thank the authors who made this possible:
 
   The source code of NetSieben Secure Shell C++ Library can be found in
   QtCreator/src/libs/3rdparty.
+
+
+* ClassView and ImageViewer plugins
+
+  Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+
+  All rights reserved.
+  Copyright (c) 2010 Denis Mingulov.
+
+  Contact: Nokia Corporation (info@qt.nokia.com)
+
+  This file is part of Qt Creator.
+
+  You may use this file under the terms of the BSD license as follows:
+
+  "Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+      the names of its contributors may be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
+
+