diff options
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/configure.bat b/configure.bat index 4771bbda1a..0f0638b3db 100644 --- a/configure.bat +++ b/configure.bat @@ -1,7 +1,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -:: Contact: http://www.qt-project.org/legal +:: Copyright (C) 2015 The Qt Company Ltd. +:: Contact: http://www.qt.io/licensing/ :: :: This file is part of the tools applications of the Qt Toolkit. :: @@ -10,9 +10,9 @@ :: Licensees holding valid commercial Qt licenses may use this file in :: accordance with the commercial license agreement provided with the :: Software or, alternatively, in accordance with the terms contained in -:: a written agreement between you and Digia. For licensing terms and -:: conditions see http://qt.digia.com/licensing. For further information -:: use the contact form at http://qt.digia.com/contact-us. +:: a written agreement between you and The Qt Company. For licensing terms +:: and conditions see http://www.qt.io/terms-conditions. For further +:: information use the contact form at http://www.qt.io/contact-us. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ :: requirements will be met: https://www.gnu.org/licenses/lgpl.html and :: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: -:: In addition, as a special exception, Digia gives you certain additional -:: rights. These rights are described in the Digia Qt LGPL Exception +:: As a special exception, The Qt Company gives you certain additional +:: rights. These rights are described in The Qt Company LGPL Exception :: version 1.1, included in the file LGPL_EXCEPTION.txt in this package. :: :: $QT_END_LICENSE$ @@ -34,7 +34,7 @@ @echo off set QTSRC=%~dp0 set QTDIR=%CD% -if not exist %QTSRC%\.gitignore goto sconf +if not exist %QTSRC%.gitignore goto sconf echo Please wait while bootstrapping configure ... for %%C in (cl.exe icl.exe g++.exe perl.exe) do set %%C=%%~$PATH:C @@ -47,7 +47,7 @@ if not exist mkspecs ( md mkspecs if errorlevel 1 goto exit ) -perl %QTSRC%bin\syncqt.pl -minimal -module QtCore -outdir %QTDIR% %QTSRC% +perl %QTSRC%bin\syncqt.pl -minimal -module QtCore -outdir "%QTDIR%" %QTSRC% if errorlevel 1 goto exit if not exist tools\configure ( @@ -59,7 +59,7 @@ if errorlevel 1 goto exit echo #### Generated by configure.bat - DO NOT EDIT! ####> Makefile echo/>> Makefile -for /f "tokens=3 usebackq" %%V in (`findstr QT_VERSION_STR %QTSRC%\src\corelib\global\qglobal.h`) do @echo QTVERSION = %%~V>> Makefile +for /f "tokens=3 usebackq" %%V in (`findstr QT_VERSION_STR %QTSRC%src\corelib\global\qglobal.h`) do @echo QTVERSION = %%~V>> Makefile if not "%cl.exe%" == "" ( echo CXX = cl>>Makefile echo EXTRA_CXXFLAGS =>>Makefile @@ -99,5 +99,5 @@ configure.exe -srcdir %QTSRC% %* goto exit :sconf -%QTSRC%\configure.exe %* +%QTSRC%configure.exe %* :exit |