AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3a8d7b0b9a
qt5base-lts/tools/configure/configureapp.cpp

4123 lines
174 KiB
C++
Raw Normal View History

Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
/****************************************************************************
**
Update copyright year in license headers. Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-05 04:03:39 +00:00
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
Update contact information in license headers. Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-20 03:06:31 +00:00
** Contact: http://www.qt-project.org/
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
Update licenseheader text in source files for qtbase Qt module Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
2011-05-24 09:34:08 +00:00
** 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.
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
**
** In addition, as a special exception, Nokia gives you certain additional
Update licenseheader text in source files for qtbase Qt module Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
2011-05-24 09:34:08 +00:00
** rights. These rights are described in the Nokia Qt LGPL Exception
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
Update licenseheader text in source files for qtbase Qt module Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
2011-05-24 09:34:08 +00:00
** 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.
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
**
Update licenseheader text in source files for qtbase Qt module Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
2011-05-24 09:34:08 +00:00
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
**
**
**
**
**
Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-24 06:17:24 +00:00
**
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
** $QT_END_LICENSE$
**
****************************************************************************/
#include "configureapp.h"
#include "environment.h"
#ifdef COMMERCIAL_VERSION
# include "tools.h"
#endif
#include <QDate>
#include <qdir.h>
Support mkspecs in subdirs for xcompile under windows Support mkspecs in subdirectories for cross compilation under windows. Mkspecs in subdirectories are separated by slashes. Change-Id: Id3954cc38df2922b20156589335faad989ec0537 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-02 09:42:20 +00:00
#include <qdiriterator.h>
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#include <qtemporaryfile.h>
#include <qstack.h>
#include <qdebug.h>
#include <qfileinfo.h>
#include <qtextstream.h>
#include <qregexp.h>
#include <qhash.h>
#include <iostream>
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
#include <string>
#include <fstream>
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#include <windows.h>
#include <conio.h>
QT_BEGIN_NAMESPACE
Support other platform names on configure.exe Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX and Blackberry. Default is "Windows". Change-Id: Ifa4d1b9c02cda956be9becdf8db195d3d494f1d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-08 13:20:35 +00:00
enum Platforms {
WINDOWS,
WINDOWS_CE,
QNX,
BLACKBERRY
};
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
std::ostream &operator<<(std::ostream &s, const QString &val) {
s << val.toLocal8Bit().data();
return s;
}
using namespace std;
// Macros to simplify options marking
#define MARK_OPTION(x,y) ( dictionary[ #x ] == #y ? "*" : " " )
bool writeToFile(const char* text, const QString &filename)
{
QByteArray symFile(text);
QFile file(filename);
QDir dir(QFileInfo(file).absoluteDir());
if (!dir.exists())
dir.mkpath(dir.absolutePath());
Make configure.exe create files with Windows line-endings Except for the perl sources, just in case. This helps if you need to open the output files in, say, notepad.exe. Change-Id: Ibf46b74af2efd6936586650e1405750bfef17952 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-24 17:14:10 +00:00
if (!file.open(QFile::WriteOnly | QFile::Text)) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
cout << "Couldn't write to " << qPrintable(filename) << ": " << qPrintable(file.errorString())
<< endl;
return false;
}
file.write(symFile);
return true;
}
Configure::Configure(int& argc, char** argv)
{
// Default values for indentation
optionIndent = 4;
descIndent = 25;
outputWidth = 0;
// Get console buffer output width
CONSOLE_SCREEN_BUFFER_INFO info;
HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
if (GetConsoleScreenBufferInfo(hStdout, &info))
outputWidth = info.dwSize.X - 1;
outputWidth = qMin(outputWidth, 79); // Anything wider gets unreadable
if (outputWidth < 35) // Insanely small, just use 79
outputWidth = 79;
int i;
/*
** Set up the initial state, the default
*/
dictionary[ "CONFIGCMD" ] = argv[ 0 ];
for (i = 1; i < argc; i++)
configCmdLine += argv[ i ];
bootstrap configure.exe on windows it is *ugly* to have the binary in the repository. this adds a few seconds to the windows build, as the configure needs to be rebuilt, obviously. that's almost negligible. Change-Id: I40ffde23b3c3af2b6bab3e78cd0a9f433214b563 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-02-08 10:38:07 +00:00
if (configCmdLine.size() >= 2 && configCmdLine.at(0) == "-srcdir") {
sourcePath = QDir::cleanPath(configCmdLine.at(1));
sourceDir = QDir(sourcePath);
configCmdLine.erase(configCmdLine.begin(), configCmdLine.begin() + 2);
} else {
// Get the path to the executable
wchar_t module_name[MAX_PATH];
GetModuleFileName(0, module_name, sizeof(module_name) / sizeof(wchar_t));
QFileInfo sourcePathInfo = QString::fromWCharArray(module_name);
sourcePath = sourcePathInfo.absolutePath();
sourceDir = sourcePathInfo.dir();
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
buildPath = QDir::currentPath();
#if 0
const QString installPath = QString("C:\\Qt\\%1").arg(QT_VERSION_STR);
#else
const QString installPath = buildPath;
#endif
if (sourceDir != buildDir) { //shadow builds!
if (!findFile("perl") && !findFile("perl.exe")) {
cout << "Error: Creating a shadow build of Qt requires" << endl
<< "perl to be in the PATH environment";
exit(0); // Exit cleanly for Ctrl+C
}
cout << "Preparing build tree..." << endl;
QDir(buildPath).mkpath("bin");
{ //make a syncqt script(s) that can be used in the shadow
QFile syncqt(buildPath + "/bin/syncqt");
Make configure.exe create files with Windows line-endings Except for the perl sources, just in case. This helps if you need to open the output files in, say, notepad.exe. Change-Id: Ibf46b74af2efd6936586650e1405750bfef17952 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-24 17:14:10 +00:00
// no QFile::Text, just in case the perl interpreter can't cope with them (unlikely)
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (syncqt.open(QFile::WriteOnly)) {
QTextStream stream(&syncqt);
stream << "#!/usr/bin/perl -w" << endl
<< "require \"" << sourcePath + "/bin/syncqt\";" << endl;
}
QFile syncqt_bat(buildPath + "/bin/syncqt.bat");
Make configure.exe create files with Windows line-endings Except for the perl sources, just in case. This helps if you need to open the output files in, say, notepad.exe. Change-Id: Ibf46b74af2efd6936586650e1405750bfef17952 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-24 17:14:10 +00:00
if (syncqt_bat.open(QFile::WriteOnly | QFile::Text)) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QTextStream stream(&syncqt_bat);
stream << "@echo off" << endl
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
<< "call " << QDir::toNativeSeparators(sourcePath + "/bin/syncqt.bat")
<< " -qtdir \"" << QDir::toNativeSeparators(buildPath) << "\" %*" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
syncqt_bat.close();
}
}
Try to make sure the config test script is installed. And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-07-25 12:07:54 +00:00
QFile configtests(buildPath + "/bin/qtmodule-configtests");
Make configure.exe create files with Windows line-endings Except for the perl sources, just in case. This helps if you need to open the output files in, say, notepad.exe. Change-Id: Ibf46b74af2efd6936586650e1405750bfef17952 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-24 17:14:10 +00:00
// no QFile::Text, just in case the perl interpreter can't cope with them (unlikely)
Try to make sure the config test script is installed. And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-07-25 12:07:54 +00:00
if (configtests.open(QFile::WriteOnly)) {
QTextStream stream(&configtests);
stream << "#!/usr/bin/perl -w" << endl
<< "require \"" << sourcePath + "/bin/qtmodule-configtests\";" << endl;
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// For Windows CE and shadow builds we need to copy these to the
// build directory.
QFile::copy(sourcePath + "/bin/setcepaths.bat" , buildPath + "/bin/setcepaths.bat");
//copy the mkspecs
buildDir.mkpath("mkspecs");
if (!Environment::cpdir(sourcePath + "/mkspecs", buildPath + "/mkspecs")){
cout << "Couldn't copy mkspecs!" << sourcePath << " " << buildPath << endl;
dictionary["DONE"] = "error";
return;
}
}
Remove 'tests' as default build part. This requires 'configure -make tests' if you want to automatically build autotests for a module by default. You can still go into the individual tests/ directories and 'qmake && make check' to build and run the autotests. configure -developer-build will enable the tests by default, like it did in Qt4. Change-Id: If4d870987de0947a8328509dcc227fa9e6284201 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:15:22 +00:00
defaultBuildParts << QStringLiteral("libs") << QStringLiteral("examples");
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_SOURCE_TREE" ] = sourcePath;
dictionary[ "QT_BUILD_TREE" ] = buildPath;
dictionary[ "QT_INSTALL_PREFIX" ] = installPath;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "QMAKESPEC" ] = getenv("QMAKESPEC");
if (dictionary[ "QMAKESPEC" ].size() == 0) {
dictionary[ "QMAKESPEC" ] = Environment::detectQMakeSpec();
dictionary[ "QMAKESPEC_FROM" ] = "detected";
} else {
dictionary[ "QMAKESPEC_FROM" ] = "env";
}
dictionary[ "QCONFIG" ] = "full";
dictionary[ "EMBEDDED" ] = "no";
dictionary[ "BUILD_QMAKE" ] = "yes";
dictionary[ "DSPFILES" ] = "yes";
dictionary[ "VCPROJFILES" ] = "yes";
dictionary[ "QMAKE_INTERNAL" ] = "no";
dictionary[ "FAST" ] = "no";
dictionary[ "NOPROCESS" ] = "no";
Add Qt Widgets opt out support to build system There should be a clear QWidget free path for people with no interest in legacy QWidget functionality. Adding this option to configure makes this path readily accessible and hence testable. Change-Id: If87c1063fcf4c46f5280836126c11999feaa9f8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-07 00:11:44 +00:00
dictionary[ "WIDGETS" ] = "yes";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "RTTI" ] = "yes";
dictionary[ "SSE2" ] = "auto";
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
dictionary[ "SSE3" ] = "auto";
dictionary[ "SSSE3" ] = "auto";
dictionary[ "SSE4_1" ] = "auto";
dictionary[ "SSE4_2" ] = "auto";
dictionary[ "AVX" ] = "auto";
dictionary[ "AVX2" ] = "auto";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "IWMMXT" ] = "auto";
dictionary[ "SYNCQT" ] = "auto";
dictionary[ "CE_CRT" ] = "no";
dictionary[ "CETEST" ] = "auto";
dictionary[ "CE_SIGNATURE" ] = "no";
dictionary[ "PHONON_BACKEND" ] = "yes";
dictionary[ "AUDIO_BACKEND" ] = "auto";
dictionary[ "WMSDK" ] = "auto";
dictionary[ "DIRECTSHOW" ] = "no";
Add V8 snapshot support A V8 snapshot is a serialized representation of the JavaScript heap. Using a snapshot can vastly speed up V8 initialization. This commit introduces a new tool, mkv8snapshot. mkv8snapshot is automatically invoked as part of building QtV8, and generates a .cpp file which is compiled into the QtV8 library. Because mkv8snapshot itself needs to initialize the V8 environment the non-snapshot way (i.e., by evaluating thousands of lines of JavaScript), it needs to build all of V8. This means that V8 is effectively built twice when snapshots are enabled. When cross-compiling, only host=i386 and target=arm is supported, since that's the only relevant case for which V8 currently supports a simulator. mkv8snapshot is built and run as a host tool (using the simulator), and generates a snapshot that will be used on the target. Task-number: QTBUG-21152 Change-Id: I9270652f129505508f78db8b0a39fbf57dc8b86d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-11-18 08:48:54 +00:00
dictionary[ "V8SNAPSHOT" ] = "auto";
Rename the 'declarative debug support' to 'qml debug support' Since the library and almost everything got renamed to qml, we should do so for the debugging support, too. (CONFIG+=declarative_debug will continue to work for some time being, but prints a deprecated warning). Change-Id: I295155dce873e2585c1452d2bf0625ea6ce219c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-30 11:43:10 +00:00
dictionary[ "QML_DEBUG" ] = "yes";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
dictionary[ "DIRECTWRITE" ] = "no";
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
dictionary[ "NIS" ] = "no";
dictionary[ "NEON" ] = "no";
Avoid macro re-definition after 1838a6c2fb5e3b4368c871aa330d028b255b83af Change-Id: I2631ff687881278ba42edacd237a2130c103b69f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2012-06-21 20:33:07 +00:00
dictionary[ "LARGE_FILE" ] = "yes";
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
dictionary[ "FONT_CONFIG" ] = "no";
dictionary[ "POSIX_IPC" ] = "no";
dictionary[ "QT_GLIB" ] = "no";
//Only used when cross compiling.
dictionary[ "QT_INSTALL_SETTINGS" ] = "/etc/xdg";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QString version;
QFile qglobal_h(sourcePath + "/src/corelib/global/qglobal.h");
if (qglobal_h.open(QFile::ReadOnly)) {
QTextStream read(&qglobal_h);
QRegExp version_regexp("^# *define *QT_VERSION_STR *\"([^\"]*)\"");
QString line;
while (!read.atEnd()) {
line = read.readLine();
if (version_regexp.exactMatch(line)) {
version = version_regexp.cap(1).trimmed();
if (!version.isEmpty())
break;
}
}
qglobal_h.close();
}
if (version.isEmpty())
version = QString("%1.%2.%3").arg(QT_VERSION>>16).arg(((QT_VERSION>>8)&0xff)).arg(QT_VERSION&0xff);
dictionary[ "VERSION" ] = version;
{
QRegExp version_re("([0-9]*)\\.([0-9]*)\\.([0-9]*)(|-.*)");
if (version_re.exactMatch(version)) {
dictionary[ "VERSION_MAJOR" ] = version_re.cap(1);
dictionary[ "VERSION_MINOR" ] = version_re.cap(2);
dictionary[ "VERSION_PATCH" ] = version_re.cap(3);
}
}
dictionary[ "REDO" ] = "no";
dictionary[ "DEPENDENCIES" ] = "no";
dictionary[ "BUILD" ] = "debug";
dictionary[ "BUILDALL" ] = "auto"; // Means yes, but not explicitly
dictionary[ "BUILDTYPE" ] = "none";
dictionary[ "BUILDDEV" ] = "no";
dictionary[ "SHARED" ] = "yes";
dictionary[ "ZLIB" ] = "auto";
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
dictionary[ "PCRE" ] = "auto";
Add support for ICU on Windows Needed by QtWebKit now. Change-Id: I177d8dcf6063a14501f7ba3081b43a29a48661c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-08 02:51:27 +00:00
dictionary[ "ICU" ] = "auto";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "GIF" ] = "auto";
dictionary[ "JPEG" ] = "auto";
dictionary[ "PNG" ] = "auto";
dictionary[ "LIBJPEG" ] = "auto";
dictionary[ "LIBPNG" ] = "auto";
Use freetype font engine on Windows As windows' fontdatabases also uses functionalities from qbasicunixfontdatabase it was renamed to qbasicfontdatabase. But instead of iterating over the font directories' files it uses system calls to obtain the list of fonts and uses registry values to find the according filenames to add. The native font engine was still kept. It can be activated by adding fontengine=native as platformargument. Change-Id: I7197bed5d18b8a33d4aa97ce91bfa1cd281b80ea Reviewed-on: http://codereview.qt-project.org/5839 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Sanity-Review: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
2011-10-07 08:00:04 +00:00
dictionary[ "FREETYPE" ] = "yes";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "ACCESSIBILITY" ] = "yes";
dictionary[ "OPENGL" ] = "yes";
dictionary[ "OPENVG" ] = "no";
dictionary[ "OPENSSL" ] = "auto";
dictionary[ "DBUS" ] = "auto";
dictionary[ "STYLE_WINDOWS" ] = "yes";
dictionary[ "STYLE_WINDOWSXP" ] = "auto";
dictionary[ "STYLE_WINDOWSVISTA" ] = "auto";
dictionary[ "STYLE_PLASTIQUE" ] = "yes";
dictionary[ "STYLE_CLEANLOOKS" ]= "yes";
dictionary[ "STYLE_WINDOWSCE" ] = "no";
dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
dictionary[ "STYLE_MOTIF" ] = "yes";
dictionary[ "STYLE_CDE" ] = "yes";
dictionary[ "STYLE_GTK" ] = "no";
dictionary[ "SQL_MYSQL" ] = "no";
dictionary[ "SQL_ODBC" ] = "no";
dictionary[ "SQL_OCI" ] = "no";
dictionary[ "SQL_PSQL" ] = "no";
dictionary[ "SQL_TDS" ] = "no";
dictionary[ "SQL_DB2" ] = "no";
dictionary[ "SQL_SQLITE" ] = "auto";
dictionary[ "SQL_SQLITE_LIB" ] = "qt";
dictionary[ "SQL_SQLITE2" ] = "no";
dictionary[ "SQL_IBASE" ] = "no";
QString tmp = dictionary[ "QMAKESPEC" ];
if (tmp.contains("\\")) {
tmp = tmp.mid(tmp.lastIndexOf("\\") + 1);
} else {
tmp = tmp.mid(tmp.lastIndexOf("/") + 1);
}
dictionary[ "QMAKESPEC" ] = tmp;
dictionary[ "INCREDIBUILD_XGE" ] = "auto";
dictionary[ "LTCG" ] = "no";
dictionary[ "NATIVE_GESTURES" ] = "yes";
dictionary[ "MSVC_MP" ] = "no";
}
Configure::~Configure()
{
for (int i=0; i<3; ++i) {
QList<MakeItem*> items = makeList[i];
for (int j=0; j<items.size(); ++j)
delete items[j];
}
}
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString Configure::formatPath(const QString &path)
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
{
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString ret = QDir::cleanPath(path);
// This amount of quoting is deemed sufficient. ™
if (ret.contains(QLatin1Char(' '))) {
ret.prepend(QLatin1Char('"'));
ret.append(QLatin1Char('"'));
}
return ret;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString Configure::formatPaths(const QStringList &paths)
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
{
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString ret;
foreach (const QString &path, paths) {
if (!ret.isEmpty())
ret += QLatin1Char(' ');
ret += formatPath(path);
}
return ret;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
// We could use QDir::homePath() + "/.qt-license", but
// that will only look in the first of $HOME,$USERPROFILE
// or $HOMEDRIVE$HOMEPATH. So, here we try'em all to be
// more forgiving for the end user..
QString Configure::firstLicensePath()
{
QStringList allPaths;
allPaths << "./.qt-license"
<< QString::fromLocal8Bit(getenv("HOME")) + "/.qt-license"
<< QString::fromLocal8Bit(getenv("USERPROFILE")) + "/.qt-license"
<< QString::fromLocal8Bit(getenv("HOMEDRIVE")) + QString::fromLocal8Bit(getenv("HOMEPATH")) + "/.qt-license";
for (int i = 0; i< allPaths.count(); ++i)
if (QFile::exists(allPaths.at(i)))
return allPaths.at(i);
return QString();
}
// #### somehow I get a compiler error about vc++ reaching the nesting limit without
// undefining the ansi for scoping.
#ifdef for
#undef for
#endif
void Configure::parseCmdLine()
{
int argCount = configCmdLine.size();
int i = 0;
Moving tiff image format support and libtiff out of qtbase The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-01-25 15:04:51 +00:00
const QStringList imageFormats = QStringList() << "gif" << "png" << "jpeg";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#if !defined(EVAL)
if (argCount < 1) // skip rest if no arguments
;
else if (configCmdLine.at(i) == "-redo") {
dictionary[ "REDO" ] = "yes";
configCmdLine.clear();
reloadCmdLine();
}
else if (configCmdLine.at(i) == "-loadconfig") {
++i;
if (i != argCount) {
dictionary[ "REDO" ] = "yes";
dictionary[ "CUSTOMCONFIG" ] = "_" + configCmdLine.at(i);
configCmdLine.clear();
reloadCmdLine();
} else {
dictionary[ "HELP" ] = "yes";
}
i = 0;
}
argCount = configCmdLine.size();
#endif
// Look first for XQMAKESPEC
for (int j = 0 ; j < argCount; ++j)
{
if (configCmdLine.at(j) == "-xplatform") {
++j;
if (j == argCount)
break;
dictionary["XQMAKESPEC"] = configCmdLine.at(j);
if (!dictionary[ "XQMAKESPEC" ].isEmpty())
applySpecSpecifics();
}
}
for (; i<configCmdLine.size(); ++i) {
bool continueElse[] = {false, false};
if (configCmdLine.at(i) == "-help"
|| configCmdLine.at(i) == "-h"
|| configCmdLine.at(i) == "-?")
dictionary[ "HELP" ] = "yes";
#if !defined(EVAL)
else if (configCmdLine.at(i) == "-qconfig") {
++i;
if (i == argCount)
break;
dictionary[ "QCONFIG" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-release") {
dictionary[ "BUILD" ] = "release";
if (dictionary[ "BUILDALL" ] == "auto")
dictionary[ "BUILDALL" ] = "no";
} else if (configCmdLine.at(i) == "-debug") {
dictionary[ "BUILD" ] = "debug";
if (dictionary[ "BUILDALL" ] == "auto")
dictionary[ "BUILDALL" ] = "no";
} else if (configCmdLine.at(i) == "-debug-and-release")
dictionary[ "BUILDALL" ] = "yes";
else if (configCmdLine.at(i) == "-shared")
dictionary[ "SHARED" ] = "yes";
else if (configCmdLine.at(i) == "-static")
dictionary[ "SHARED" ] = "no";
else if (configCmdLine.at(i) == "-developer-build")
dictionary[ "BUILDDEV" ] = "yes";
else if (configCmdLine.at(i) == "-opensource") {
dictionary[ "BUILDTYPE" ] = "opensource";
}
else if (configCmdLine.at(i) == "-commercial") {
dictionary[ "BUILDTYPE" ] = "commercial";
}
else if (configCmdLine.at(i) == "-ltcg") {
dictionary[ "LTCG" ] = "yes";
}
else if (configCmdLine.at(i) == "-no-ltcg") {
dictionary[ "LTCG" ] = "no";
}
else if (configCmdLine.at(i) == "-mp") {
dictionary[ "MSVC_MP" ] = "yes";
}
else if (configCmdLine.at(i) == "-no-mp") {
dictionary[ "MSVC_MP" ] = "no";
}
Windows: Add -force-asserts to configure.exe Change-Id: I678011f0e60d74a1b2d63a18570778e1f686f123 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
2011-11-17 09:37:24 +00:00
else if (configCmdLine.at(i) == "-force-asserts") {
dictionary[ "FORCE_ASSERTS" ] = "yes";
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#endif
else if (configCmdLine.at(i) == "-platform") {
++i;
if (i == argCount)
break;
dictionary[ "QMAKESPEC" ] = configCmdLine.at(i);
dictionary[ "QMAKESPEC_FROM" ] = "commandline";
} else if (configCmdLine.at(i) == "-arch") {
++i;
if (i == argCount)
break;
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
dictionary["OBSOLETE_ARCH_ARG"] = "yes";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
} else if (configCmdLine.at(i) == "-embedded") {
dictionary[ "EMBEDDED" ] = "yes";
} else if (configCmdLine.at(i) == "-xplatform") {
++i;
// do nothing
}
#if !defined(EVAL)
else if (configCmdLine.at(i) == "-no-zlib") {
// No longer supported since Qt 4.4.0
// But save the information for later so that we can print a warning
//
// If you REALLY really need no zlib support, you can still disable
// it by doing the following:
// add "no-zlib" to mkspecs/qconfig.pri
// #define QT_NO_COMPRESS (probably by adding to src/corelib/global/qconfig.h)
//
// There's no guarantee that Qt will build under those conditions
dictionary[ "ZLIB_FORCED" ] = "yes";
} else if (configCmdLine.at(i) == "-qt-zlib") {
dictionary[ "ZLIB" ] = "qt";
} else if (configCmdLine.at(i) == "-system-zlib") {
dictionary[ "ZLIB" ] = "system";
}
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
else if (configCmdLine.at(i) == "-qt-pcre") {
dictionary[ "PCRE" ] = "qt";
} else if (configCmdLine.at(i) == "-system-pcre") {
dictionary[ "PCRE" ] = "system";
}
Add support for ICU on Windows Needed by QtWebKit now. Change-Id: I177d8dcf6063a14501f7ba3081b43a29a48661c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-08 02:51:27 +00:00
else if (configCmdLine.at(i) == "-icu") {
dictionary[ "ICU" ] = "yes";
} else if (configCmdLine.at(i) == "-no-icu") {
dictionary[ "ICU" ] = "no";
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Image formats --------------------------------------------
else if (configCmdLine.at(i) == "-no-gif")
dictionary[ "GIF" ] = "no";
else if (configCmdLine.at(i) == "-no-libjpeg") {
dictionary[ "JPEG" ] = "no";
dictionary[ "LIBJPEG" ] = "no";
} else if (configCmdLine.at(i) == "-qt-libjpeg") {
dictionary[ "LIBJPEG" ] = "qt";
} else if (configCmdLine.at(i) == "-system-libjpeg") {
dictionary[ "LIBJPEG" ] = "system";
}
else if (configCmdLine.at(i) == "-no-libpng") {
dictionary[ "PNG" ] = "no";
dictionary[ "LIBPNG" ] = "no";
} else if (configCmdLine.at(i) == "-qt-libpng") {
dictionary[ "LIBPNG" ] = "qt";
} else if (configCmdLine.at(i) == "-system-libpng") {
dictionary[ "LIBPNG" ] = "system";
}
// Text Rendering --------------------------------------------
else if (configCmdLine.at(i) == "-no-freetype")
dictionary[ "FREETYPE" ] = "no";
else if (configCmdLine.at(i) == "-qt-freetype")
dictionary[ "FREETYPE" ] = "yes";
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
else if (configCmdLine.at(i) == "-system-freetype")
dictionary[ "FREETYPE" ] = "system";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// CE- C runtime --------------------------------------------
else if (configCmdLine.at(i) == "-crt") {
++i;
if (i == argCount)
break;
QDir cDir(configCmdLine.at(i));
if (!cDir.exists())
cout << "WARNING: Could not find directory (" << qPrintable(configCmdLine.at(i)) << ")for C runtime deployment" << endl;
else
dictionary[ "CE_CRT" ] = QDir::toNativeSeparators(cDir.absolutePath());
} else if (configCmdLine.at(i) == "-qt-crt") {
dictionary[ "CE_CRT" ] = "yes";
} else if (configCmdLine.at(i) == "-no-crt") {
dictionary[ "CE_CRT" ] = "no";
}
// cetest ---------------------------------------------------
else if (configCmdLine.at(i) == "-no-cetest") {
dictionary[ "CETEST" ] = "no";
dictionary[ "CETEST_REQUESTED" ] = "no";
} else if (configCmdLine.at(i) == "-cetest") {
// although specified to use it, we stay at "auto" state
// this is because checkAvailability() adds variables
// we need for crosscompilation; but remember if we asked
// for it.
dictionary[ "CETEST_REQUESTED" ] = "yes";
}
// Qt/CE - signing tool -------------------------------------
else if (configCmdLine.at(i) == "-signature") {
++i;
if (i == argCount)
break;
QFileInfo info(configCmdLine.at(i));
if (!info.exists())
cout << "WARNING: Could not find signature file (" << qPrintable(configCmdLine.at(i)) << ")" << endl;
else
dictionary[ "CE_SIGNATURE" ] = QDir::toNativeSeparators(info.absoluteFilePath());
}
// Styles ---------------------------------------------------
else if (configCmdLine.at(i) == "-qt-style-windows")
dictionary[ "STYLE_WINDOWS" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-windows")
dictionary[ "STYLE_WINDOWS" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-windowsce")
dictionary[ "STYLE_WINDOWSCE" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-windowsce")
dictionary[ "STYLE_WINDOWSCE" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-windowsmobile")
dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-windowsmobile")
dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-windowsxp")
dictionary[ "STYLE_WINDOWSXP" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-windowsxp")
dictionary[ "STYLE_WINDOWSXP" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-windowsvista")
dictionary[ "STYLE_WINDOWSVISTA" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-windowsvista")
dictionary[ "STYLE_WINDOWSVISTA" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-plastique")
dictionary[ "STYLE_PLASTIQUE" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-plastique")
dictionary[ "STYLE_PLASTIQUE" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-cleanlooks")
dictionary[ "STYLE_CLEANLOOKS" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-cleanlooks")
dictionary[ "STYLE_CLEANLOOKS" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-motif")
dictionary[ "STYLE_MOTIF" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-motif")
dictionary[ "STYLE_MOTIF" ] = "no";
else if (configCmdLine.at(i) == "-qt-style-cde")
dictionary[ "STYLE_CDE" ] = "yes";
else if (configCmdLine.at(i) == "-no-style-cde")
dictionary[ "STYLE_CDE" ] = "no";
// Work around compiler nesting limitation
else
continueElse[1] = true;
if (!continueElse[1]) {
}
// OpenGL Support -------------------------------------------
else if (configCmdLine.at(i) == "-no-opengl") {
dictionary[ "OPENGL" ] = "no";
} else if (configCmdLine.at(i) == "-opengl-es-cm") {
dictionary[ "OPENGL" ] = "yes";
dictionary[ "OPENGL_ES_CM" ] = "yes";
} else if (configCmdLine.at(i) == "-opengl-es-2") {
dictionary[ "OPENGL" ] = "yes";
dictionary[ "OPENGL_ES_2" ] = "yes";
} else if (configCmdLine.at(i) == "-opengl") {
dictionary[ "OPENGL" ] = "yes";
i++;
if (i == argCount)
break;
if (configCmdLine.at(i) == "es1") {
dictionary[ "OPENGL_ES_CM" ] = "yes";
} else if ( configCmdLine.at(i) == "es2" ) {
dictionary[ "OPENGL_ES_2" ] = "yes";
} else if ( configCmdLine.at(i) == "desktop" ) {
// OPENGL=yes suffices
} else {
cout << "Argument passed to -opengl option is not valid." << endl;
dictionary[ "DONE" ] = "error";
break;
}
Windows: Add ANGLE support. - Add QWindowsEGLContext usable for ANGLE and Windows CE. - Add QWindowsEGLStaticContext containing the display for resource cleanup. - Add EGLSurface to QWindowsWindow. - Add a -angle option specifying the path to the external ANGLE installation to configure, add libraries to the mkspecs. Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com> Task-number: QTBUG-24207 Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-05-23 13:07:06 +00:00
// External location of ANGLE library (Open GL ES 2)
} else if (configCmdLine.at(i) == QStringLiteral("-angle")) {
if (++i == argCount)
break;
const QFileInfo fi(configCmdLine.at(i));
if (!fi.isDir()) {
cout << "Argument passed to -angle option is not a directory." << endl;
dictionary.insert(QStringLiteral("DONE"), QStringLiteral( "error"));
}
dictionary.insert(QStringLiteral("ANGLE_DIR"), fi.absoluteFilePath());
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
// OpenVG Support -------------------------------------------
else if (configCmdLine.at(i) == "-openvg") {
dictionary[ "OPENVG" ] = "yes";
} else if (configCmdLine.at(i) == "-no-openvg") {
dictionary[ "OPENVG" ] = "no";
}
// Databases ------------------------------------------------
else if (configCmdLine.at(i) == "-qt-sql-mysql")
dictionary[ "SQL_MYSQL" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-mysql")
dictionary[ "SQL_MYSQL" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-mysql")
dictionary[ "SQL_MYSQL" ] = "no";
else if (configCmdLine.at(i) == "-qt-sql-odbc")
dictionary[ "SQL_ODBC" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-odbc")
dictionary[ "SQL_ODBC" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-odbc")
dictionary[ "SQL_ODBC" ] = "no";
else if (configCmdLine.at(i) == "-qt-sql-oci")
dictionary[ "SQL_OCI" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-oci")
dictionary[ "SQL_OCI" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-oci")
dictionary[ "SQL_OCI" ] = "no";
else if (configCmdLine.at(i) == "-qt-sql-psql")
dictionary[ "SQL_PSQL" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-psql")
dictionary[ "SQL_PSQL" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-psql")
dictionary[ "SQL_PSQL" ] = "no";
else if (configCmdLine.at(i) == "-qt-sql-tds")
dictionary[ "SQL_TDS" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-tds")
dictionary[ "SQL_TDS" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-tds")
dictionary[ "SQL_TDS" ] = "no";
else if (configCmdLine.at(i) == "-qt-sql-db2")
dictionary[ "SQL_DB2" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-db2")
dictionary[ "SQL_DB2" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-db2")
dictionary[ "SQL_DB2" ] = "no";
else if (configCmdLine.at(i) == "-qt-sql-sqlite")
dictionary[ "SQL_SQLITE" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-sqlite")
dictionary[ "SQL_SQLITE" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-sqlite")
dictionary[ "SQL_SQLITE" ] = "no";
else if (configCmdLine.at(i) == "-system-sqlite")
dictionary[ "SQL_SQLITE_LIB" ] = "system";
else if (configCmdLine.at(i) == "-qt-sql-sqlite2")
dictionary[ "SQL_SQLITE2" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-sqlite2")
dictionary[ "SQL_SQLITE2" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-sqlite2")
dictionary[ "SQL_SQLITE2" ] = "no";
else if (configCmdLine.at(i) == "-qt-sql-ibase")
dictionary[ "SQL_IBASE" ] = "yes";
else if (configCmdLine.at(i) == "-plugin-sql-ibase")
dictionary[ "SQL_IBASE" ] = "plugin";
else if (configCmdLine.at(i) == "-no-sql-ibase")
dictionary[ "SQL_IBASE" ] = "no";
// Image formats --------------------------------------------
else if (configCmdLine.at(i).startsWith("-qt-imageformat-") &&
imageFormats.contains(configCmdLine.at(i).section('-', 3)))
dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "yes";
else if (configCmdLine.at(i).startsWith("-plugin-imageformat-") &&
imageFormats.contains(configCmdLine.at(i).section('-', 3)))
dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "plugin";
else if (configCmdLine.at(i).startsWith("-no-imageformat-") &&
imageFormats.contains(configCmdLine.at(i).section('-', 3)))
dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "no";
#endif
// IDE project generation -----------------------------------
else if (configCmdLine.at(i) == "-no-dsp")
dictionary[ "DSPFILES" ] = "no";
else if (configCmdLine.at(i) == "-dsp")
dictionary[ "DSPFILES" ] = "yes";
else if (configCmdLine.at(i) == "-no-vcp")
dictionary[ "VCPFILES" ] = "no";
else if (configCmdLine.at(i) == "-vcp")
dictionary[ "VCPFILES" ] = "yes";
else if (configCmdLine.at(i) == "-no-vcproj")
dictionary[ "VCPROJFILES" ] = "no";
else if (configCmdLine.at(i) == "-vcproj")
dictionary[ "VCPROJFILES" ] = "yes";
else if (configCmdLine.at(i) == "-no-incredibuild-xge")
dictionary[ "INCREDIBUILD_XGE" ] = "no";
else if (configCmdLine.at(i) == "-incredibuild-xge")
dictionary[ "INCREDIBUILD_XGE" ] = "yes";
else if (configCmdLine.at(i) == "-native-gestures")
dictionary[ "NATIVE_GESTURES" ] = "yes";
else if (configCmdLine.at(i) == "-no-native-gestures")
dictionary[ "NATIVE_GESTURES" ] = "no";
#if !defined(EVAL)
// Others ---------------------------------------------------
else if (configCmdLine.at(i) == "-fast")
dictionary[ "FAST" ] = "yes";
else if (configCmdLine.at(i) == "-no-fast")
dictionary[ "FAST" ] = "no";
Add Qt Widgets opt out support to build system There should be a clear QWidget free path for people with no interest in legacy QWidget functionality. Adding this option to configure makes this path readily accessible and hence testable. Change-Id: If87c1063fcf4c46f5280836126c11999feaa9f8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-07 00:11:44 +00:00
else if (configCmdLine.at(i) == "-widgets")
dictionary[ "WIDGETS" ] = "yes";
else if (configCmdLine.at(i) == "-no-widgets")
dictionary[ "WIDGETS" ] = "no";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (configCmdLine.at(i) == "-rtti")
dictionary[ "RTTI" ] = "yes";
else if (configCmdLine.at(i) == "-no-rtti")
dictionary[ "RTTI" ] = "no";
else if (configCmdLine.at(i) == "-accessibility")
dictionary[ "ACCESSIBILITY" ] = "yes";
else if (configCmdLine.at(i) == "-no-accessibility") {
dictionary[ "ACCESSIBILITY" ] = "no";
cout << "Setting accessibility to NO" << endl;
}
else if (configCmdLine.at(i) == "-no-sse2")
dictionary[ "SSE2" ] = "no";
else if (configCmdLine.at(i) == "-sse2")
dictionary[ "SSE2" ] = "yes";
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
else if (configCmdLine.at(i) == "-no-sse3")
dictionary[ "SSE3" ] = "no";
else if (configCmdLine.at(i) == "-sse3")
dictionary[ "SSE3" ] = "yes";
else if (configCmdLine.at(i) == "-no-ssse3")
dictionary[ "SSSE3" ] = "no";
else if (configCmdLine.at(i) == "-ssse3")
dictionary[ "SSSE3" ] = "yes";
else if (configCmdLine.at(i) == "-no-sse4.1")
dictionary[ "SSE4_1" ] = "no";
else if (configCmdLine.at(i) == "-sse4.1")
dictionary[ "SSE4_1" ] = "yes";
else if (configCmdLine.at(i) == "-no-sse4.2")
dictionary[ "SSE4_2" ] = "no";
else if (configCmdLine.at(i) == "-sse4.2")
dictionary[ "SSE4_2" ] = "yes";
else if (configCmdLine.at(i) == "-no-avx")
dictionary[ "AVX" ] = "no";
else if (configCmdLine.at(i) == "-avx")
dictionary[ "AVX" ] = "yes";
else if (configCmdLine.at(i) == "-no-avx2")
dictionary[ "AVX2" ] = "no";
else if (configCmdLine.at(i) == "-avx2")
dictionary[ "AVX2" ] = "yes";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (configCmdLine.at(i) == "-no-iwmmxt")
dictionary[ "IWMMXT" ] = "no";
else if (configCmdLine.at(i) == "-iwmmxt")
dictionary[ "IWMMXT" ] = "yes";
else if (configCmdLine.at(i) == "-no-openssl") {
dictionary[ "OPENSSL"] = "no";
} else if (configCmdLine.at(i) == "-openssl") {
dictionary[ "OPENSSL" ] = "yes";
} else if (configCmdLine.at(i) == "-openssl-linked") {
dictionary[ "OPENSSL" ] = "linked";
} else if (configCmdLine.at(i) == "-no-qdbus") {
dictionary[ "DBUS" ] = "no";
} else if (configCmdLine.at(i) == "-qdbus") {
dictionary[ "DBUS" ] = "yes";
} else if (configCmdLine.at(i) == "-no-dbus") {
dictionary[ "DBUS" ] = "no";
} else if (configCmdLine.at(i) == "-dbus") {
dictionary[ "DBUS" ] = "yes";
} else if (configCmdLine.at(i) == "-dbus-linked") {
dictionary[ "DBUS" ] = "linked";
} else if (configCmdLine.at(i) == "-audio-backend") {
dictionary[ "AUDIO_BACKEND" ] = "yes";
} else if (configCmdLine.at(i) == "-no-audio-backend") {
dictionary[ "AUDIO_BACKEND" ] = "no";
} else if (configCmdLine.at(i) == "-no-phonon-backend") {
dictionary[ "PHONON_BACKEND" ] = "no";
} else if (configCmdLine.at(i) == "-phonon-backend") {
dictionary[ "PHONON_BACKEND" ] = "yes";
} else if (configCmdLine.at(i) == "-phonon-wince-ds9") {
dictionary[ "DIRECTSHOW" ] = "yes";
Rename the 'declarative debug support' to 'qml debug support' Since the library and almost everything got renamed to qml, we should do so for the debugging support, too. (CONFIG+=declarative_debug will continue to work for some time being, but prints a deprecated warning). Change-Id: I295155dce873e2585c1452d2bf0625ea6ce219c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-30 11:43:10 +00:00
} else if (configCmdLine.at(i) == "-no-qml-debug") {
dictionary[ "QML_DEBUG" ] = "no";
} else if (configCmdLine.at(i) == "-qml-debug") {
dictionary[ "QML_DEBUG" ] = "yes";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
} else if (configCmdLine.at(i) == "-no-plugin-manifests") {
dictionary[ "PLUGIN_MANIFESTS" ] = "no";
} else if (configCmdLine.at(i) == "-plugin-manifests") {
dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
}
// Work around compiler nesting limitation
else
continueElse[0] = true;
if (!continueElse[0]) {
}
else if (configCmdLine.at(i) == "-internal")
dictionary[ "QMAKE_INTERNAL" ] = "yes";
bootstrap configure.exe on windows it is *ugly* to have the binary in the repository. this adds a few seconds to the windows build, as the configure needs to be rebuilt, obviously. that's almost negligible. Change-Id: I40ffde23b3c3af2b6bab3e78cd0a9f433214b563 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-02-08 10:38:07 +00:00
else if (configCmdLine.at(i) == "-no-syncqt")
dictionary[ "SYNCQT" ] = "no";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (configCmdLine.at(i) == "-no-qmake")
dictionary[ "BUILD_QMAKE" ] = "no";
else if (configCmdLine.at(i) == "-qmake")
dictionary[ "BUILD_QMAKE" ] = "yes";
else if (configCmdLine.at(i) == "-dont-process")
dictionary[ "NOPROCESS" ] = "yes";
else if (configCmdLine.at(i) == "-process")
dictionary[ "NOPROCESS" ] = "no";
else if (configCmdLine.at(i) == "-no-qmake-deps")
dictionary[ "DEPENDENCIES" ] = "no";
else if (configCmdLine.at(i) == "-qmake-deps")
dictionary[ "DEPENDENCIES" ] = "yes";
else if (configCmdLine.at(i) == "-qtnamespace") {
++i;
if (i == argCount)
break;
dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i);
} else if (configCmdLine.at(i) == "-qtlibinfix") {
++i;
if (i == argCount)
break;
dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i);
} else if (configCmdLine.at(i) == "-D") {
++i;
if (i == argCount)
break;
qmakeDefines += configCmdLine.at(i);
} else if (configCmdLine.at(i) == "-I") {
++i;
if (i == argCount)
break;
qmakeIncludes += configCmdLine.at(i);
} else if (configCmdLine.at(i) == "-L") {
++i;
if (i == argCount)
break;
Don't use check as an identifier in the configure app. Avoids conflict with macro on Mac OS. Change-Id: I3426c2dc514240d80996d823b7a552c13a09f99e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-09 18:03:48 +00:00
QFileInfo checkDirectory(configCmdLine.at(i));
if (!checkDirectory.isDir()) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
cout << "Argument passed to -L option is not a directory path. Did you mean the -l option?" << endl;
dictionary[ "DONE" ] = "error";
break;
}
qmakeLibs += QString("-L" + configCmdLine.at(i));
} else if (configCmdLine.at(i) == "-l") {
++i;
if (i == argCount)
break;
qmakeLibs += QString("-l" + configCmdLine.at(i));
} else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS=")) {
opensslLibs = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) {
psqlLibs = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("SYBASE=")) {
sybase = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) {
sybaseLibs = configCmdLine.at(i);
}
else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){
++i;
if (i == argCount)
break;
dictionary[ "VERSION" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-saveconfig") {
++i;
if (i == argCount)
break;
dictionary[ "CUSTOMCONFIG" ] = "_" + configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-confirm-license") {
dictionary["LICENSE_CONFIRMED"] = "yes";
}
Sync configure with Unix version (-make/-nomake) Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:09:59 +00:00
else if (configCmdLine.at(i) == "-make") {
++i;
if (i == argCount)
break;
buildParts += configCmdLine.at(i);
} else if (configCmdLine.at(i) == "-nomake") {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
++i;
if (i == argCount)
break;
Windows: Fix handling of -nomake. Add to list of disabled build parts (see b9a498bf514255b2a6298f44801d3d43c958044c). This fixes the tests are currently built in developer-build despite "-nomake tests". Change-Id: I43282112e03328dd89d8c874ca31b0483742ddb3 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-28 08:07:34 +00:00
nobuildParts.append(configCmdLine.at(i));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
// Directories ----------------------------------------------
else if (configCmdLine.at(i) == "-prefix") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_PREFIX" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-bindir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_BINS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-libdir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_LIBS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-docdir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_DOCS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-headerdir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_HEADERS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-plugindir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_PLUGINS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-importdir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_IMPORTS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-datadir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_DATA" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-translationdir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_TRANSLATIONS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-examplesdir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_EXAMPLES" ] = configCmdLine.at(i);
}
Added build system support for installing tests. Tests will install under $$[QT_INSTALL_TESTS]. TESTDATA may be used to install additional testdata required by the test. The default install rule may be disabled by CONFIG+=no_testcase_installs. Change-Id: I204de60c8e844775906ffd016ca50bffbb414142 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-17 05:39:19 +00:00
else if (configCmdLine.at(i) == "-testsdir") {
++i;
if (i == argCount)
break;
dictionary[ "QT_INSTALL_TESTS" ] = configCmdLine.at(i);
}
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
else if (configCmdLine.at(i) == "-sysroot") {
++i;
if (i == argCount)
break;
dictionary[ "CFG_SYSROOT" ] = configCmdLine.at(i);
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (configCmdLine.at(i) == "-hostprefix") {
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
++i;
if (i == argCount || configCmdLine.at(i).startsWith('-'))
dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_BUILD_TREE" ];
else
dictionary[ "QT_HOST_PREFIX" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-hostbindir") {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
++i;
if (i == argCount)
break;
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
dictionary[ "QT_HOST_BINS" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-hostdatadir") {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
++i;
if (i == argCount)
break;
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
Sync configure with Unix version (-make/-nomake) Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:09:59 +00:00
else if (configCmdLine.at(i) == "-make-tool") {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
++i;
if (i == argCount)
break;
dictionary[ "MAKE" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i).indexOf(QRegExp("^-(en|dis)able-")) != -1) {
// Scan to see if any specific modules and drivers are enabled or disabled
for (QStringList::Iterator module = modules.begin(); module != modules.end(); ++module) {
if (configCmdLine.at(i) == QString("-enable-") + (*module)) {
enabledModules += (*module);
break;
}
else if (configCmdLine.at(i) == QString("-disable-") + (*module)) {
disabledModules += (*module);
break;
}
}
}
else if (configCmdLine.at(i) == "-directwrite") {
dictionary["DIRECTWRITE"] = "yes";
} else if (configCmdLine.at(i) == "-no-directwrite") {
dictionary["DIRECTWRITE"] = "no";
}
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
else if (configCmdLine.at(i) == "-nis") {
dictionary["NIS"] = "yes";
} else if (configCmdLine.at(i) == "-no-nis") {
dictionary["NIS"] = "no";
}
else if (configCmdLine.at(i) == "-cups") {
dictionary["QT_CUPS"] = "yes";
} else if (configCmdLine.at(i) == "-no-cups") {
dictionary["QT_CUPS"] = "no";
}
else if (configCmdLine.at(i) == "-iconv") {
dictionary["QT_ICONV"] = "yes";
} else if (configCmdLine.at(i) == "-no-iconv") {
dictionary["QT_ICONV"] = "no";
} else if (configCmdLine.at(i) == "-sun-iconv") {
dictionary["QT_ICONV"] = "sun";
} else if (configCmdLine.at(i) == "-gnu-iconv") {
dictionary["QT_ICONV"] = "gnu";
}
else if (configCmdLine.at(i) == "-neon") {
dictionary["NEON"] = "yes";
} else if (configCmdLine.at(i) == "-no-neon") {
dictionary["NEON"] = "no";
}
else if (configCmdLine.at(i) == "-largefile") {
dictionary["LARGE_FILE"] = "yes";
}
else if (configCmdLine.at(i) == "-fontconfig") {
dictionary["FONT_CONFIG"] = "yes";
} else if (configCmdLine.at(i) == "-no-fontconfig") {
dictionary["FONT_CONFIG"] = "no";
}
else if (configCmdLine.at(i) == "-posix-ipc") {
dictionary["POSIX_IPC"] = "yes";
}
else if (configCmdLine.at(i) == "-glib") {
dictionary["QT_GLIB"] = "yes";
}
else if (configCmdLine.at(i) == "-sysconfdir") {
++i;
if (i == argCount)
break;
dictionary["QT_INSTALL_SETTINGS"] = configCmdLine.at(i);
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else {
dictionary[ "HELP" ] = "yes";
cout << "Unknown option " << configCmdLine.at(i) << endl;
break;
}
#endif
}
// Ensure that QMAKESPEC exists in the mkspecs folder
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
const QString mkspecPath(sourcePath + "/mkspecs");
Support mkspecs in subdirs for xcompile under windows Support mkspecs in subdirectories for cross compilation under windows. Mkspecs in subdirectories are separated by slashes. Change-Id: Id3954cc38df2922b20156589335faad989ec0537 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-02 09:42:20 +00:00
QDirIterator itMkspecs(mkspecPath, QDir::AllDirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
QStringList mkspecs;
while (itMkspecs.hasNext()) {
QString mkspec = itMkspecs.next();
// Remove base PATH
mkspec.remove(0, mkspecPath.length() + 1);
mkspecs << mkspec;
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["QMAKESPEC"].toLower() == "features"
|| !mkspecs.contains(dictionary["QMAKESPEC"], Qt::CaseInsensitive)) {
dictionary[ "HELP" ] = "yes";
if (dictionary ["QMAKESPEC_FROM"] == "commandline") {
cout << "Invalid option \"" << dictionary["QMAKESPEC"] << "\" for -platform." << endl;
} else if (dictionary ["QMAKESPEC_FROM"] == "env") {
cout << "QMAKESPEC environment variable is set to \"" << dictionary["QMAKESPEC"]
<< "\" which is not a supported platform" << endl;
} else { // was autodetected from environment
cout << "Unable to detect the platform from environment. Use -platform command line"
"argument or set the QMAKESPEC environment variable and run configure again" << endl;
}
cout << "See the README file for a list of supported operating systems and compilers." << endl;
} else {
if (dictionary[ "QMAKESPEC" ].endsWith("-icc") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc.net") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2002") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2003") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") ||
Add Visual Studio 11 mkspec This adds the Visual Studio 11 mkspec and the corresponding changes to configure and qmake makesystem. Change-Id: I3a7e82a6f7f90aa0a94dedd493ebaa66bf100923 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-16 06:50:55 +00:00
dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc11")) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake";
dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
} else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) {
if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "mingw32-make";
merge Makefile.win32-g++{,-sh} the only difference is in the copy & del commands. the msys tools are tolerant about windows paths, so this just works. the in-makefile variant detection is stolen from tools/configure/. Change-Id: Ia283c1fe2e2aaa8cd5b1dfd7ae29244115f07d65 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-29 18:38:03 +00:00
dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
} else {
if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "make";
dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
}
}
// Tell the user how to proceed building Qt after configure finished its job
dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"];
if (dictionary.contains("XQMAKESPEC")) {
remove symbian support from configure Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-07 09:16:21 +00:00
if (dictionary["XQMAKESPEC"].startsWith("wince")) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary["QTBUILDINSTRUCTION"] =
QString("setcepaths.bat ") + dictionary["XQMAKESPEC"] + QString(" && ") + dictionary["MAKE"];
}
}
// Tell the user how to confclean before the next configure
dictionary["CONFCLEANINSTRUCTION"] = dictionary["MAKE"] + QString(" confclean");
// Ensure that -spec (XQMAKESPEC) exists in the mkspecs folder as well
if (dictionary.contains("XQMAKESPEC") &&
!mkspecs.contains(dictionary["XQMAKESPEC"], Qt::CaseInsensitive)) {
dictionary["HELP"] = "yes";
cout << "Invalid option \"" << dictionary["XQMAKESPEC"] << "\" for -xplatform." << endl;
}
// Ensure that the crt to be deployed can be found
if (dictionary["CE_CRT"] != QLatin1String("yes") && dictionary["CE_CRT"] != QLatin1String("no")) {
QDir cDir(dictionary["CE_CRT"]);
QStringList entries = cDir.entryList();
bool hasDebug = entries.contains("msvcr80.dll");
bool hasRelease = entries.contains("msvcr80d.dll");
if ((dictionary["BUILDALL"] == "auto") && (!hasDebug || !hasRelease)) {
cout << "Could not find debug and release c-runtime." << endl;
cout << "You need to have msvcr80.dll and msvcr80d.dll in" << endl;
cout << "the path specified. Setting to -no-crt";
dictionary[ "CE_CRT" ] = "no";
} else if ((dictionary["BUILD"] == "debug") && !hasDebug) {
cout << "Could not find debug c-runtime (msvcr80d.dll) in the directory specified." << endl;
cout << "Setting c-runtime automatic deployment to -no-crt" << endl;
dictionary[ "CE_CRT" ] = "no";
} else if ((dictionary["BUILD"] == "release") && !hasRelease) {
cout << "Could not find release c-runtime (msvcr80.dll) in the directory specified." << endl;
cout << "Setting c-runtime automatic deployment to -no-crt" << endl;
dictionary[ "CE_CRT" ] = "no";
}
}
// Allow tests for private classes to be compiled against internal builds
if (dictionary["BUILDDEV"] == "yes")
qtConfig += "private_tests";
Windows: Add -force-asserts to configure.exe Change-Id: I678011f0e60d74a1b2d63a18570778e1f686f123 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
2011-11-17 09:37:24 +00:00
if (dictionary["FORCE_ASSERTS"] == "yes")
qtConfig += "force_asserts";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#if !defined(EVAL)
for (QStringList::Iterator dis = disabledModules.begin(); dis != disabledModules.end(); ++dis) {
modules.removeAll((*dis));
}
for (QStringList::Iterator ena = enabledModules.begin(); ena != enabledModules.end(); ++ena) {
if (modules.indexOf((*ena)) == -1)
modules += (*ena);
}
qtConfig += modules;
for (QStringList::Iterator it = disabledModules.begin(); it != disabledModules.end(); ++it)
qtConfig.removeAll(*it);
if ((dictionary[ "REDO" ] != "yes") && (dictionary[ "HELP" ] != "yes"))
saveCmdLine();
#endif
}
#if !defined(EVAL)
void Configure::validateArgs()
{
// Validate the specified config
// Get all possible configurations from the file system.
QDir dir;
QStringList filters;
filters << "qconfig-*.h";
dir.setNameFilters(filters);
dir.setPath(sourcePath + "/src/corelib/global/");
QStringList stringList = dir.entryList();
QStringList::Iterator it;
for (it = stringList.begin(); it != stringList.end(); ++it)
allConfigs << it->remove("qconfig-").remove(".h");
allConfigs << "full";
// Try internal configurations first.
QStringList possible_configs = QStringList()
<< "minimal"
<< "small"
<< "medium"
<< "large"
<< "full";
int index = possible_configs.indexOf(dictionary["QCONFIG"]);
if (index >= 0) {
for (int c = 0; c <= index; c++) {
qmakeConfig += possible_configs[c] + "-config";
}
return;
}
// If the internal configurations failed, try others.
QStringList::Iterator config;
for (config = allConfigs.begin(); config != allConfigs.end(); ++config) {
if ((*config) == dictionary[ "QCONFIG" ])
break;
}
if (config == allConfigs.end()) {
dictionary[ "HELP" ] = "yes";
cout << "No such configuration \"" << qPrintable(dictionary[ "QCONFIG" ]) << "\"" << endl ;
}
else
qmakeConfig += (*config) + "-config";
}
#endif
// Output helper functions --------------------------------[ Start ]-
/*!
Determines the length of a string token.
*/
static int tokenLength(const char *str)
{
if (*str == 0)
return 0;
const char *nextToken = strpbrk(str, " _/\n\r");
if (nextToken == str || !nextToken)
return 1;
return int(nextToken - str);
}
/*!
Prints out a string which starts at position \a startingAt, and
indents each wrapped line with \a wrapIndent characters.
The wrap point is set to the console width, unless that width
cannot be determined, or is too small.
*/
void Configure::desc(const char *description, int startingAt, int wrapIndent)
{
int linePos = startingAt;
bool firstLine = true;
const char *nextToken = description;
while (*nextToken) {
int nextTokenLen = tokenLength(nextToken);
if (*nextToken == '\n' // Wrap on newline, duh
|| (linePos + nextTokenLen > outputWidth)) // Wrap at outputWidth
{
printf("\n");
linePos = 0;
firstLine = false;
if (*nextToken == '\n')
++nextToken;
continue;
}
if (!firstLine && linePos < wrapIndent) { // Indent to wrapIndent
printf("%*s", wrapIndent , "");
linePos = wrapIndent;
if (*nextToken == ' ') {
++nextToken;
continue;
}
}
printf("%.*s", nextTokenLen, nextToken);
linePos += nextTokenLen;
nextToken += nextTokenLen;
}
}
/*!
Prints out an option with its description wrapped at the
description starting point. If \a skipIndent is true, the
indentation to the option is not outputted (used by marked option
version of desc()). Extra spaces between option and its
description is filled with\a fillChar, if there's available
space.
*/
void Configure::desc(const char *option, const char *description, bool skipIndent, char fillChar)
{
if (!skipIndent)
printf("%*s", optionIndent, "");
int remaining = descIndent - optionIndent - strlen(option);
int wrapIndent = descIndent + qMax(0, 1 - remaining);
printf("%s", option);
if (remaining > 2) {
printf(" "); // Space in front
for (int i = remaining; i > 2; --i)
printf("%c", fillChar); // Fill, if available space
}
printf(" "); // Space between option and description
desc(description, wrapIndent, wrapIndent);
printf("\n");
}
/*!
Same as above, except it also marks an option with an '*', if
the option is default action.
*/
void Configure::desc(const char *mark_option, const char *mark, const char *option, const char *description, char fillChar)
{
const QString markedAs = dictionary.value(mark_option);
if (markedAs == "auto" && markedAs == mark) // both "auto", always => +
printf(" + ");
else if (markedAs == "auto") // setting marked as "auto" and option is default => +
printf(" %c " , (defaultTo(mark_option) == QLatin1String(mark))? '+' : ' ');
else if (QLatin1String(mark) == "auto" && markedAs != "no") // description marked as "auto" and option is available => +
printf(" %c " , checkAvailability(mark_option) ? '+' : ' ');
else // None are "auto", (markedAs == mark) => *
printf(" %c " , markedAs == QLatin1String(mark) ? '*' : ' ');
desc(option, description, true, fillChar);
}
/*!
Modifies the default configuration based on given -platform option.
Eg. switches to different default styles for Windows CE.
*/
void Configure::applySpecSpecifics()
{
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
if (!dictionary[ "XQMAKESPEC" ].isEmpty()) {
//Disable building tools, docs and translations when cross compiling.
nobuildParts << "docs" << "translations" << "tools";
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary[ "XQMAKESPEC" ].startsWith("wince")) {
dictionary[ "STYLE_WINDOWSXP" ] = "no";
dictionary[ "STYLE_WINDOWSVISTA" ] = "no";
dictionary[ "STYLE_PLASTIQUE" ] = "no";
dictionary[ "STYLE_CLEANLOOKS" ] = "no";
dictionary[ "STYLE_WINDOWSCE" ] = "yes";
dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes";
dictionary[ "STYLE_MOTIF" ] = "no";
dictionary[ "STYLE_CDE" ] = "no";
dictionary[ "FREETYPE" ] = "no";
dictionary[ "OPENGL" ] = "no";
dictionary[ "OPENSSL" ] = "no";
dictionary[ "RTTI" ] = "no";
dictionary[ "SSE2" ] = "no";
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
dictionary[ "SSE3" ] = "no";
dictionary[ "SSSE3" ] = "no";
dictionary[ "SSE4_1" ] = "no";
dictionary[ "SSE4_2" ] = "no";
dictionary[ "AVX" ] = "no";
dictionary[ "AVX2" ] = "no";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "IWMMXT" ] = "no";
dictionary[ "CE_CRT" ] = "yes";
dictionary[ "DIRECTSHOW" ] = "no";
// We only apply MMX/IWMMXT for mkspecs we know they work
if (dictionary[ "XQMAKESPEC" ].startsWith("wincewm")) {
dictionary[ "MMX" ] = "yes";
dictionary[ "IWMMXT" ] = "yes";
dictionary[ "DIRECTSHOW" ] = "yes";
}
dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ];
dictionary[ "QT_INSTALL_PREFIX" ] = "";
} else if (dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong.
//TODO
dictionary[ "STYLE_WINDOWSXP" ] = "no";
dictionary[ "STYLE_WINDOWSVISTA" ] = "no";
dictionary[ "KBD_DRIVERS" ] = "tty";
Remove unmaintained and broken VNC platform plugin Change-Id: Ie0a07c3a6822870b095a20d997b63fb1635f20be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Robert Griebl <robert.griebl@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-06 11:23:31 +00:00
dictionary[ "GFX_DRIVERS" ] = "linuxfb";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "MOUSE_DRIVERS" ] = "pc linuxtp";
dictionary[ "OPENGL" ] = "no";
dictionary[ "DBUS"] = "no";
dictionary[ "QT_QWS_DEPTH" ] = "4 8 16 24 32";
dictionary[ "QT_SXE" ] = "no";
dictionary[ "QT_INOTIFY" ] = "no";
Revert "QtPrintSupport: Remove remaining LPR specific code" This doesn't compile with a typical cross-compilation setup, which generally won't include cups headers. The commit should have been rejected, but wasn't, due to a bug in the Qt Project CI. Since it now causes all other modules depending on qtbase to fail their CI, it must be reverted to minimize disruption while the commit can be amended and/or the test toolchain updated to include cups headers. This reverts commit 80f7a388906f94f58bf765a32b9abbb16f967db2. Change-Id: I315ae275b37de358a74af28ab7bd691c9849acba Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-08 02:56:45 +00:00
dictionary[ "QT_CUPS" ] = "no";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary[ "QT_GLIB" ] = "no";
dictionary[ "QT_ICONV" ] = "no";
dictionary["DECORATIONS"] = "default windows styled";
}
}
QString Configure::locateFileInPaths(const QString &fileName, const QStringList &paths)
{
QDir d;
for (QStringList::ConstIterator it = paths.begin(); it != paths.end(); ++it) {
// Remove any leading or trailing ", this is commonly used in the environment
// variables
QString path = (*it);
if (path.startsWith("\""))
path = path.right(path.length() - 1);
if (path.endsWith("\""))
path = path.left(path.length() - 1);
if (d.exists(path + QDir::separator() + fileName)) {
return (path);
}
}
return QString();
}
QString Configure::locateFile(const QString &fileName)
{
QString file = fileName.toLower();
QStringList paths;
#if defined(Q_OS_WIN32)
QRegExp splitReg("[;,]");
#else
QRegExp splitReg("[:]");
#endif
if (file.endsWith(".h"))
paths = QString::fromLocal8Bit(getenv("INCLUDE")).split(splitReg, QString::SkipEmptyParts);
else if (file.endsWith(".lib"))
paths = QString::fromLocal8Bit(getenv("LIB")).split(splitReg, QString::SkipEmptyParts);
else
paths = QString::fromLocal8Bit(getenv("PATH")).split(splitReg, QString::SkipEmptyParts);
return locateFileInPaths(file, paths);
}
// Output helper functions ---------------------------------[ Stop ]-
bool Configure::displayHelp()
{
if (dictionary[ "HELP" ] == "yes") {
Remove the build-key from the plugin verification data The build-key is an old mechanism to work around binary incompatibilities in GCC 3.x versions. Modern GCC has not broken binary compatibility since 3.4, making this mechanism obsolete. The cache value stored now only includes Qt version, the debug/release boolean, and the last modified time for the plugin. Old 4-value keys will be replaced with new keys as the plugins are reloaded the first time. This also removes QLibraryInfo::buildKey(), which is a source-incompatible change. The UNIX and Windows configure tools have been updated to stop outputting the QT_BUILD_KEY preprocessor directive. See also: http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000892.html Change-Id: I7d06969a370d3d2c6de413c1230d9d6789cbf195 Reviewed-on: http://codereview.qt.nokia.com/3977 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
2011-08-31 12:23:42 +00:00
desc("Usage: configure\n"
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
"[-release] [-debug] [-debug-and-release] [-shared] [-static]\n"
turn off exceptions by default where they aren't required This significantly reduces the size of the generated code in places where we don't need exceptions. The -(no-)exceptions configure flag has been removed in the process, as there is now a fine grained way to control this on a per module level, and Qt is being compiled without exceptions in most places. Change-Id: I99a15c5d03339db1fbffd4987935d0d671cdbc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-05-09 16:52:44 +00:00
"[-no-fast] [-fast] \n"
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
"[-no-accessibility] [-accessibility] [-no-rtti] [-rtti]\n"
Remove the -no-stl option from configure This was decided on the mailing list. See: http://lists.qt-project.org/pipermail/development/2012-March/002442.html http://lists.qt-project.org/pipermail/development/2012-March/002465.html Change-Id: I7681e5cc743b20f6d4e29d2aea45c50df41a0b98 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-26 17:57:40 +00:00
"[-no-sql-<driver>] [-qt-sql-<driver>]\n"
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
"[-plugin-sql-<driver>] [-system-sqlite]\n"
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
"[-D <define>] [-I <includepath>] [-L <librarypath>]\n"
"[-help] [-no-dsp] [-dsp] [-no-vcproj] [-vcproj]\n"
"[-no-qmake] [-qmake] [-dont-process] [-process]\n"
"[-no-style-<style>] [-qt-style-<style>] [-redo]\n"
"[-saveconfig <config>] [-loadconfig <config>]\n"
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
"[-qt-zlib] [-system-zlib] [-qt-pcre] [-system-pcre] [-no-gif]\n"
Moving tiff image format support and libtiff out of qtbase The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-01-25 15:04:51 +00:00
"[-no-libpng] [-qt-libpng] [-system-libpng]\n"
"[-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n"
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
"[-sse2] [-no-sse2] [-sse3] [-no-sse3]\n"
"[-ssse3] [-no-ssse3]\n"
"[-sse4.1] [-no-sse4.1] [-sse4.2] [-no-sse4.2]\n"
"[-avx] [-no-avx] [-avx2] [-no-avx2]\n"
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
"[-no-iwmmxt] [-iwmmxt] [-openssl] [-openssl-linked]\n"
"[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
"[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
"[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
"[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
"[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
"[-no-webkit] [-webkit] [-webkit-debug]\n"
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
"[-no-directwrite] [-directwrite] [-no-widgets] [-icu]\n"
"[-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]\n"
"[-iconv] [-sun-iconv] [-gnu-iconv] [-neon] [-no-neon]\n"
"[-largefile] [-font-config] [-no-fontconfig] [-posix-ipc]\n"
"[-glib] [-sysconfdir <dir>]\n\n", 0, 7);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
desc("Installation options:\n\n");
Add more descriptions for configure for Windows Add some more of the prefix options that are already implemented to the usage information. Change-Id: I89ee37ebc6deee8b6a5fd5a1c16d26ae3ead1f30 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-10 12:37:57 +00:00
desc("These are optional, but you may specify install directories.\n\n", 0, 1);
desc( "-prefix <dir>", "This will install everything relative to <dir> (default $QT_INSTALL_PREFIX)\n\n");
desc( "-hostprefix [dir]", "Tools and libraries needed when developing applications are installed in [dir]. "
"If [dir] is not given, the current build directory will be used. (default PREFIX)\n");
desc("You may use these to separate different parts of the install:\n\n");
desc( "-bindir <dir>", "Executables will be installed to <dir> (default PREFIX/bin)");
desc( "-libdir <dir>", "Libraries will be installed to <dir> (default PREFIX/lib)");
desc( "-docdir <dir>", "Documentation will be installed to <dir> (default PREFIX/doc)");
desc( "-headerdir <dir>", "Headers will be installed to <dir> (default PREFIX/include)");
desc( "-plugindir <dir>", "Plugins will be installed to <dir> (default PREFIX/plugins)");
desc( "-importdir <dir>", "Imports for QML will be installed to <dir> (default PREFIX/imports)");
desc( "-datadir <dir>", "Data used by Qt programs will be installed to <dir> (default PREFIX)");
desc( "-translationdir <dir>", "Translations of Qt programs will be installed to <dir> (default PREFIX/translations)");
desc( "-examplesdir <dir>", "Examples will be installed to <dir> (default PREFIX/examples)");
desc( "-testsdir <dir>", "Tests will be installed to <dir> (default PREFIX/tests)");
desc( "-hostbindir <dir>", "Host executables will be installed to <dir> (default HOSTPREFIX/bin)");
desc( "-hostdatadir <dir>", "Data used by qmake will be installed to <dir> (default HOSTPREFIX)");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#if !defined(EVAL)
desc("Configure options:\n\n");
desc(" The defaults (*) are usually acceptable. A plus (+) denotes a default value"
" that needs to be evaluated. If the evaluation succeeds, the feature is"
" included. Here is a short explanation of each option:\n\n", 0, 1);
desc("BUILD", "release","-release", "Compile and link Qt with debugging turned off.");
desc("BUILD", "debug", "-debug", "Compile and link Qt with debugging turned on.");
desc("BUILDALL", "yes", "-debug-and-release", "Compile and link two Qt libraries, with and without debugging turned on.\n");
desc("OPENSOURCE", "opensource", "-opensource", "Compile and link the Open-Source Edition of Qt.");
desc("COMMERCIAL", "commercial", "-commercial", "Compile and link the Commercial Edition of Qt.\n");
desc("BUILDDEV", "yes", "-developer-build", "Compile and link Qt with Qt developer options (including auto-tests exporting)\n");
desc("SHARED", "yes", "-shared", "Create and use shared Qt libraries.");
desc("SHARED", "no", "-static", "Create and use static Qt libraries.\n");
desc("LTCG", "yes", "-ltcg", "Use Link Time Code Generation. (Release builds only)");
desc("LTCG", "no", "-no-ltcg", "Do not use Link Time Code Generation.\n");
desc("FAST", "no", "-no-fast", "Configure Qt normally by generating Makefiles for all project files.");
desc("FAST", "yes", "-fast", "Configure Qt quickly by generating Makefiles only for library and "
"subdirectory targets. All other Makefiles are created as wrappers "
"which will in turn run qmake\n");
Sync configure with Unix version (-make/-nomake) Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:09:59 +00:00
desc( "-make <part>", "Add part to the list of parts to be built at make time.");
for (int i=0; i<defaultBuildParts.size(); ++i)
desc( "", qPrintable(QString(" %1").arg(defaultBuildParts.at(i))), false, ' ');
desc( "-nomake <part>", "Exclude part from the list of parts to be built.\n");
Add Qt Widgets opt out support to build system There should be a clear QWidget free path for people with no interest in legacy QWidget functionality. Adding this option to configure makes this path readily accessible and hence testable. Change-Id: If87c1063fcf4c46f5280836126c11999feaa9f8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-07 00:11:44 +00:00
desc("WIDGETS", "no", "-no-widgets", "Disable QtWidgets module\n");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
desc("ACCESSIBILITY", "no", "-no-accessibility", "Do not compile Windows Active Accessibility support.");
desc("ACCESSIBILITY", "yes", "-accessibility", "Compile Windows Active Accessibility support.\n");
desc( "-no-sql-<driver>", "Disable SQL <driver> entirely, by default none are turned on.");
desc( "-qt-sql-<driver>", "Enable a SQL <driver> in the Qt Library.");
desc( "-plugin-sql-<driver>", "Enable SQL <driver> as a plugin to be linked to at run time.\n"
"Available values for <driver>:");
desc("SQL_MYSQL", "auto", "", " mysql", ' ');
desc("SQL_PSQL", "auto", "", " psql", ' ');
desc("SQL_OCI", "auto", "", " oci", ' ');
desc("SQL_ODBC", "auto", "", " odbc", ' ');
desc("SQL_TDS", "auto", "", " tds", ' ');
desc("SQL_DB2", "auto", "", " db2", ' ');
desc("SQL_SQLITE", "auto", "", " sqlite", ' ');
desc("SQL_SQLITE2", "auto", "", " sqlite2", ' ');
desc("SQL_IBASE", "auto", "", " ibase", ' ');
desc( "", "(drivers marked with a '+' have been detected as available on this system)\n", false, ' ');
desc( "-system-sqlite", "Use sqlite from the operating system.\n");
desc("OPENGL", "no","-no-opengl", "Disables OpenGL functionality\n");
desc("OPENGL", "no","-opengl <api>", "Enable OpenGL support with specified API version.\n"
"Available values for <api>:");
desc("", "", "", " desktop - Enable support for Desktop OpenGL", ' ');
desc("OPENGL_ES_CM", "no", "", " es1 - Enable support for OpenGL ES Common Profile", ' ');
desc("OPENGL_ES_2", "no", "", " es2 - Enable support for OpenGL ES 2.0", ' ');
desc("OPENVG", "no","-no-openvg", "Disables OpenVG functionality\n");
desc("OPENVG", "yes","-openvg", "Enables OpenVG functionality");
Windows: Add -force-asserts to configure.exe Change-Id: I678011f0e60d74a1b2d63a18570778e1f686f123 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
2011-11-17 09:37:24 +00:00
desc( "-force-asserts", "Activate asserts in release mode.\n");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#endif
desc( "-platform <spec>", "The operating system and compiler you are building on.\n(default %QMAKESPEC%)\n");
desc( "-xplatform <spec>", "The operating system and compiler you are cross compiling to.\n");
desc( "", "See the README file for a list of supported operating systems and compilers.\n", false, ' ');
Add more descriptions for configure for Windows Add some more of the prefix options that are already implemented to the usage information. Change-Id: I89ee37ebc6deee8b6a5fd5a1c16d26ae3ead1f30 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-10 12:37:57 +00:00
desc( "-sysroot <dir>", "Sets <dir> as the target compiler's and qmake's sysroot.");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
desc("NIS", "no", "-no-nis", "Do not build NIS support.");
desc("NIS", "yes", "-nis", "Build NIS support.");
desc("NEON", "yes", "-neon", "Enable the use of NEON instructions.");
desc("NEON", "no", "-no-neon", "Do not enable the use of NEON instructions.");
desc("QT_ICONV", "disable", "-no-iconv", "Do not enable support for iconv(3).");
desc("QT_ICONV", "yes", "-iconv", "Enable support for iconv(3).");
desc("QT_ICONV", "yes", "-sun-iconv", "Enable support for iconv(3) using sun-iconv.");
desc("QT_ICONV", "yes", "-gnu-iconv", "Enable support for iconv(3) using gnu-libiconv");
desc("LARGE_FILE", "yes", "-largefile", "Enables Qt to access files larger than 4 GB.");
desc("FONT_CONFIG", "yes", "-fontconfig", "Build with FontConfig support.");
desc("FONT_CONFIG", "no", "-no-fontconfig" "Do not build with FontConfig support.");
desc("POSIX_IPC", "yes", "-posix-ipc", "Enable POSIX IPC.");
desc("QT_GLIB", "yes", "-glib", "Enable Glib support.");
desc("QT_INSTALL_SETTINGS", "auto", "-sysconfdir", "Settings used by Qt programs will be looked for in <dir>.");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#if !defined(EVAL)
desc( "-qtnamespace <namespace>", "Wraps all Qt library code in 'namespace name {...}");
desc( "-qtlibinfix <infix>", "Renames all Qt* libs to Qt*<infix>\n");
desc( "-D <define>", "Add an explicit define to the preprocessor.");
desc( "-I <includepath>", "Add an explicit include path.");
desc( "-L <librarypath>", "Add an explicit library path.");
desc( "-l <libraryname>", "Add an explicit library name, residing in a librarypath.\n");
#endif
desc( "-help, -h, -?", "Display this information.\n");
#if !defined(EVAL)
// 3rd party stuff options go below here --------------------------------------------------------------------------------
desc("Third Party Libraries:\n\n");
desc("ZLIB", "qt", "-qt-zlib", "Use the zlib bundled with Qt.");
desc("ZLIB", "system", "-system-zlib", "Use zlib from the operating system.\nSee http://www.gzip.org/zlib\n");
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
desc("PCRE", "qt", "-qt-pcre", "Use the PCRE library bundled with Qt.");
desc("PCRE", "qt", "-system-pcre", "Use the PCRE library from the operating system.\nSee http://pcre.org/\n");
Add support for ICU on Windows Needed by QtWebKit now. Change-Id: I177d8dcf6063a14501f7ba3081b43a29a48661c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-08 02:51:27 +00:00
desc("ICU", "yes", "-icu", "Use the ICU library.");
desc("ICU", "no", "-no-icu", "Do not use the ICU library.\nSee http://site.icu-project.org/\n");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
desc("GIF", "no", "-no-gif", "Do not compile GIF reading support.");
desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support.");
desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt.");
desc("LIBPNG", "system","-system-libpng", "Use libpng from the operating system.\nSee http://www.libpng.org/pub/png\n");
desc("LIBJPEG", "no", "-no-libjpeg", "Do not compile JPEG support.");
desc("LIBJPEG", "qt", "-qt-libjpeg", "Use the libjpeg bundled with Qt.");
desc("LIBJPEG", "system","-system-libjpeg", "Use libjpeg from the operating system.\nSee http://www.ijg.org\n");
remove symbian support from configure Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-07 09:16:21 +00:00
desc("FREETYPE", "no", "-no-freetype", "Do not compile in Freetype2 support.");
desc("FREETYPE", "yes", "-qt-freetype", "Use the libfreetype bundled with Qt.");
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
desc("FREETYPE", "yes", "-system-freetype", "Use the libfreetype provided by the system.");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#endif
// Qt\Windows only options go below here --------------------------------------------------------------------------------
desc("Qt for Windows only:\n\n");
desc("DSPFILES", "no", "-no-dsp", "Do not generate VC++ .dsp files.");
desc("DSPFILES", "yes", "-dsp", "Generate VC++ .dsp files, only if spec \"win32-msvc\".\n");
desc("VCPROJFILES", "no", "-no-vcproj", "Do not generate VC++ .vcproj files.");
desc("VCPROJFILES", "yes", "-vcproj", "Generate VC++ .vcproj files, only if platform \"win32-msvc.net\".\n");
desc("INCREDIBUILD_XGE", "no", "-no-incredibuild-xge", "Do not add IncrediBuild XGE distribution commands to custom build steps.");
desc("INCREDIBUILD_XGE", "yes", "-incredibuild-xge", "Add IncrediBuild XGE distribution commands to custom build steps. This will distribute MOC and UIC steps, and other custom buildsteps which are added to the INCREDIBUILD_XGE variable.\n(The IncrediBuild distribution commands are only added to Visual Studio projects)\n");
desc("PLUGIN_MANIFESTS", "no", "-no-plugin-manifests", "Do not embed manifests in plugins.");
desc("PLUGIN_MANIFESTS", "yes", "-plugin-manifests", "Embed manifests in plugins.\n");
Windows: Add ANGLE support. - Add QWindowsEGLContext usable for ANGLE and Windows CE. - Add QWindowsEGLStaticContext containing the display for resource cleanup. - Add EGLSurface to QWindowsWindow. - Add a -angle option specifying the path to the external ANGLE installation to configure, add libraries to the mkspecs. Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com> Task-number: QTBUG-24207 Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-05-23 13:07:06 +00:00
desc( "-angle <dir>", "Use ANGLE library from location <dir>.\n");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
#if !defined(EVAL)
desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake.");
desc("BUILD_QMAKE", "yes", "-qmake", "Compile qmake.\n");
desc("NOPROCESS", "yes", "-dont-process", "Do not generate Makefiles/Project files. This will override -no-fast if specified.");
desc("NOPROCESS", "no", "-process", "Generate Makefiles/Project files.\n");
desc("RTTI", "no", "-no-rtti", "Do not compile runtime type information.");
desc("RTTI", "yes", "-rtti", "Compile runtime type information.\n");
desc("SSE2", "no", "-no-sse2", "Do not compile with use of SSE2 instructions");
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
desc("SSE2", "yes", "-sse2", "Compile with use of SSE2 instructions");
desc("SSE3", "no", "-no-sse3", "Do not compile with use of SSE3 instructions");
desc("SSE3", "yes", "-sse3", "Compile with use of SSE3 instructions");
desc("SSSE3", "no", "-no-ssse3", "Do not compile with use of SSSE3 instructions");
desc("SSSE3", "yes", "-ssse3", "Compile with use of SSSE3 instructions");
desc("SSE4_1", "no", "-no-sse4.1", "Do not compile with use of SSE4.1 instructions");
desc("SSE4_1", "yes", "-sse4.1", "Compile with use of SSE4.1 instructions");
desc("SSE4_2", "no", "-no-sse4.2", "Do not compile with use of SSE4.2 instructions");
desc("SSE4_2", "yes", "-sse4.2", "Compile with use of SSE4.2 instructions");
desc("AVX", "no", "-no-avx", "Do not compile with use of AVX instructions");
desc("AVX", "yes", "-avx", "Compile with use of AVX instructions");
desc("AVX2", "no", "-no-avx2", "Do not compile with use of AVX2 instructions");
desc("AVX2", "yes", "-avx2", "Compile with use of AVX2 instructions");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
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");
desc("DBUS", "no", "-no-dbus", "Do not compile in D-Bus support");
desc("DBUS", "yes", "-dbus", "Compile in D-Bus support and load libdbus-1 dynamically");
desc("DBUS", "linked", "-dbus-linked", "Compile in D-Bus support and link to libdbus-1");
desc("PHONON_BACKEND","no", "-no-phonon-backend","Do not compile the platform-specific Phonon backend-plugin");
desc("PHONON_BACKEND","yes","-phonon-backend", "Compile in the platform-specific Phonon backend-plugin");
desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia");
desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia");
Rename the 'declarative debug support' to 'qml debug support' Since the library and almost everything got renamed to qml, we should do so for the debugging support, too. (CONFIG+=declarative_debug will continue to work for some time being, but prints a deprecated warning). Change-Id: I295155dce873e2585c1452d2bf0625ea6ce219c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-30 11:43:10 +00:00
desc("QML_DEBUG", "no", "-no-qml-debug", "Do not build the QML debugging support");
desc("QML_DEBUG", "yes", "-qml-debug", "Build the QML debugging support");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering");
desc("DIRECTWRITE", "yes", "-directwrite", "Build support for DirectWrite font rendering (experimental, requires DirectWrite availability on target systems, e.g. Windows Vista with Platform Update, Windows 7, etc.)");
desc( "-no-style-<style>", "Disable <style> entirely.");
desc( "-qt-style-<style>", "Enable <style> in the Qt Library.\nAvailable styles: ");
desc("STYLE_WINDOWS", "yes", "", " windows", ' ');
desc("STYLE_WINDOWSXP", "auto", "", " windowsxp", ' ');
desc("STYLE_WINDOWSVISTA", "auto", "", " windowsvista", ' ');
desc("STYLE_PLASTIQUE", "yes", "", " plastique", ' ');
desc("STYLE_CLEANLOOKS", "yes", "", " cleanlooks", ' ');
desc("STYLE_MOTIF", "yes", "", " motif", ' ');
desc("STYLE_CDE", "yes", "", " cde", ' ');
desc("STYLE_WINDOWSCE", "yes", "", " windowsce", ' ');
desc("STYLE_WINDOWSMOBILE" , "yes", "", " windowsmobile", ' ');
desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7.");
desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7.");
desc("MSVC_MP", "no", "-no-mp", "Do not use multiple processors for compiling with MSVC");
desc("MSVC_MP", "yes", "-mp", "Use multiple processors for compiling with MSVC (-MP)");
/* We do not support -qconfig on Windows yet
desc( "-qconfig <local>", "Use src/tools/qconfig-local.h rather than the default.\nPossible values for local:");
for (int i=0; i<allConfigs.size(); ++i)
desc( "", qPrintable(QString(" %1").arg(allConfigs.at(i))), false, ' ');
printf("\n");
*/
#endif
desc( "-loadconfig <config>", "Run configure with the parameters from file configure_<config>.cache.");
desc( "-saveconfig <config>", "Run configure and save the parameters in file configure_<config>.cache.");
desc( "-redo", "Run configure with the same parameters as last time.\n");
// Qt\Windows CE only options go below here -----------------------------------------------------------------------------
desc("Qt for Windows CE only:\n\n");
desc("IWMMXT", "no", "-no-iwmmxt", "Do not compile with use of IWMMXT instructions");
desc("IWMMXT", "yes", "-iwmmxt", "Do compile with use of IWMMXT instructions (Qt for Windows CE on Arm only)");
desc("CE_CRT", "no", "-no-crt" , "Do not add the C runtime to default deployment rules");
desc("CE_CRT", "yes", "-qt-crt", "Qt identifies C runtime during project generation");
desc( "-crt <path>", "Specify path to C runtime used for project generation.");
desc("CETEST", "no", "-no-cetest", "Do not compile Windows CE remote test application");
desc("CETEST", "yes", "-cetest", "Compile Windows CE remote test application");
desc( "-signature <file>", "Use file for signing the target project");
desc("DIRECTSHOW", "no", "-phonon-wince-ds9", "Enable Phonon Direct Show 9 backend for Windows CE");
return true;
}
return false;
}
QString Configure::findFileInPaths(const QString &fileName, const QString &paths)
{
#if defined(Q_OS_WIN32)
QRegExp splitReg("[;,]");
#else
QRegExp splitReg("[:]");
#endif
QStringList pathList = paths.split(splitReg, QString::SkipEmptyParts);
QDir d;
for (QStringList::ConstIterator it = pathList.begin(); it != pathList.end(); ++it) {
// Remove any leading or trailing ", this is commonly used in the environment
// variables
QString path = (*it);
if (path.startsWith('\"'))
path = path.right(path.length() - 1);
if (path.endsWith('\"'))
path = path.left(path.length() - 1);
if (d.exists(path + QDir::separator() + fileName))
return path;
}
return QString();
}
static QString mingwPaths(const QString &mingwPath, const QString &pathName)
{
QString ret;
QDir mingwDir = QFileInfo(mingwPath).dir();
const QFileInfoList subdirs = mingwDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
for (int i = 0 ;i < subdirs.length(); ++i) {
const QFileInfo &fi = subdirs.at(i);
const QString name = fi.fileName();
if (name == pathName)
ret += fi.absoluteFilePath() + ';';
else if (name.contains("mingw"))
ret += fi.absoluteFilePath() + QDir::separator() + pathName + ';';
}
return ret;
}
bool Configure::findFile(const QString &fileName)
{
const QString file = fileName.toLower();
const QString pathEnvVar = QString::fromLocal8Bit(getenv("PATH"));
const QString mingwPath = dictionary["QMAKESPEC"].endsWith("-g++") ?
findFileInPaths("g++.exe", pathEnvVar) : QString();
QString paths;
if (file.endsWith(".h")) {
if (!mingwPath.isNull()) {
if (!findFileInPaths(file, mingwPaths(mingwPath, "include")).isNull())
return true;
//now let's try the additional compiler path
const QFileInfoList mingwConfigs = QDir(mingwPath + QLatin1String("/../lib/gcc")).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
for (int i = 0; i < mingwConfigs.length(); ++i) {
const QDir mingwLibDir = mingwConfigs.at(i).absoluteFilePath();
foreach(const QFileInfo &version, mingwLibDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot)) {
if (!findFileInPaths(file, version.absoluteFilePath() + QLatin1String("/include")).isNull())
return true;
}
}
}
paths = QString::fromLocal8Bit(getenv("INCLUDE"));
} else if (file.endsWith(".lib") || file.endsWith(".a")) {
if (!mingwPath.isNull() && !findFileInPaths(file, mingwPaths(mingwPath, "lib")).isNull())
return true;
paths = QString::fromLocal8Bit(getenv("LIB"));
} else {
paths = pathEnvVar;
}
return !findFileInPaths(file, paths).isNull();
}
/*!
Default value for options marked as "auto" if the test passes.
(Used both by the autoDetection() below, and the desc() function
to mark (+) the default option of autodetecting options.
*/
QString Configure::defaultTo(const QString &option)
{
// We prefer using the system version of the 3rd party libs
if (option == "ZLIB"
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
|| option == "PCRE"
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
|| option == "LIBJPEG"
Moving tiff image format support and libtiff out of qtbase The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-01-25 15:04:51 +00:00
|| option == "LIBPNG")
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
return "system";
// PNG is always built-in, never a plugin
if (option == "PNG")
return "yes";
// These database drivers and image formats can be built-in or plugins.
// Prefer plugins when Qt is shared.
if (dictionary[ "SHARED" ] == "yes") {
if (option == "SQL_MYSQL"
|| option == "SQL_MYSQL"
|| option == "SQL_ODBC"
|| option == "SQL_OCI"
|| option == "SQL_PSQL"
|| option == "SQL_TDS"
|| option == "SQL_DB2"
|| option == "SQL_SQLITE"
|| option == "SQL_SQLITE2"
|| option == "SQL_IBASE"
|| option == "JPEG"
|| option == "GIF")
return "plugin";
}
// By default we do not want to compile OCI driver when compiling with
// MinGW, due to lack of such support from Oracle. It prob. wont work.
// (Customer may force the use though)
if (dictionary["QMAKESPEC"].endsWith("-g++")
&& option == "SQL_OCI")
return "no";
if (option == "SYNCQT"
&& (!QFile::exists(sourcePath + "/bin/syncqt") ||
!QFile::exists(sourcePath + "/bin/syncqt.bat")))
return "no";
return "yes";
}
/*!
Checks the system for the availability of a feature.
Returns true if the feature is available, else false.
*/
bool Configure::checkAvailability(const QString &part)
{
bool available = false;
if (part == "STYLE_WINDOWSXP")
available = findFile("uxtheme.h");
else if (part == "ZLIB")
available = findFile("zlib.h");
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
else if (part == "PCRE")
available = findFile("pcre.h");
Add support for ICU on Windows Needed by QtWebKit now. Change-Id: I177d8dcf6063a14501f7ba3081b43a29a48661c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-08 02:51:27 +00:00
else if (part == "ICU")
available = findFile("unicode/utypes.h") && findFile("unicode/ucol.h") && findFile("unicode/ustring.h") && findFile("icuin.lib");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (part == "LIBJPEG")
available = findFile("jpeglib.h");
else if (part == "LIBPNG")
available = findFile("png.h");
else if (part == "SQL_MYSQL")
available = findFile("mysql.h") && findFile("libmySQL.lib");
else if (part == "SQL_ODBC")
available = findFile("sql.h") && findFile("sqlext.h") && findFile("odbc32.lib");
else if (part == "SQL_OCI")
available = findFile("oci.h") && findFile("oci.lib");
else if (part == "SQL_PSQL")
available = findFile("libpq-fe.h") && findFile("libpq.lib") && findFile("ws2_32.lib") && findFile("advapi32.lib");
else if (part == "SQL_TDS")
available = findFile("sybfront.h") && findFile("sybdb.h") && findFile("ntwdblib.lib");
else if (part == "SQL_DB2")
available = findFile("sqlcli.h") && findFile("sqlcli1.h") && findFile("db2cli.lib");
else if (part == "SQL_SQLITE")
remove symbian support from configure Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-07 09:16:21 +00:00
available = true; // Built in, we have a fork
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (part == "SQL_SQLITE_LIB") {
if (dictionary[ "SQL_SQLITE_LIB" ] == "system") {
remove symbian support from configure Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-07 09:16:21 +00:00
available = findFile("sqlite3.h") && findFile("sqlite3.lib");
if (available)
dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
} else
available = true;
} else if (part == "SQL_SQLITE2")
available = findFile("sqlite.h") && findFile("sqlite.lib");
else if (part == "SQL_IBASE")
available = findFile("ibase.h") && (findFile("gds32_ms.lib") || findFile("gds32.lib"));
else if (part == "IWMMXT")
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
available = (dictionary.value("XQMAKESPEC").startsWith("wince"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (part == "OPENGL_ES_CM")
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
available = (dictionary.value("XQMAKESPEC").startsWith("wince"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (part == "OPENGL_ES_2")
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
available = (dictionary.value("XQMAKESPEC").startsWith("wince"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (part == "DIRECTSHOW")
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
available = (dictionary.value("XQMAKESPEC").startsWith("wince"));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (part == "SSE2")
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
available = tryCompileProject("common/sse2");
else if (part == "SSE3")
available = tryCompileProject("common/sse3");
else if (part == "SSSE3")
available = tryCompileProject("common/ssse3");
else if (part == "SSE4_1")
available = tryCompileProject("common/sse4_1");
else if (part == "SSE4_2")
available = tryCompileProject("common/sse4_2");
else if (part == "AVX")
available = tryCompileProject("common/avx");
else if (part == "AVX2")
available = tryCompileProject("common/avx2");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else if (part == "OPENSSL")
available = findFile("openssl\\ssl.h");
else if (part == "DBUS")
available = findFile("dbus\\dbus.h");
else if (part == "CETEST") {
QString rapiHeader = locateFile("rapi.h");
QString rapiLib = locateFile("rapi.lib");
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
available = (dictionary.value("XQMAKESPEC").startsWith("wince")) && !rapiHeader.isEmpty() && !rapiLib.isEmpty();
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (available) {
dictionary[ "QT_CE_RAPI_INC" ] += QLatin1String("\"") + rapiHeader + QLatin1String("\"");
dictionary[ "QT_CE_RAPI_LIB" ] += QLatin1String("\"") + rapiLib + QLatin1String("\"");
}
else if (dictionary[ "CETEST_REQUESTED" ] == "yes") {
cout << "cetest could not be enabled: rapi.h and rapi.lib could not be found." << endl;
cout << "Make sure the environment is set up for compiling with ActiveSync." << endl;
dictionary[ "DONE" ] = "error";
}
}
else if (part == "INCREDIBUILD_XGE")
available = findFile("BuildConsole.exe") && findFile("xgConsole.exe");
else if (part == "PHONON") {
remove symbian support from configure Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-07 09:16:21 +00:00
available = findFile("vmr9.h") && findFile("dshow.h") && findFile("dmo.h") && findFile("dmodshow.h")
&& (findFile("strmiids.lib") || findFile("libstrmiids.a"))
&& (findFile("dmoguids.lib") || findFile("libdmoguids.a"))
&& (findFile("msdmo.lib") || findFile("libmsdmo.a"))
&& findFile("d3d9.h");
if (!available) {
cout << "All the required DirectShow/Direct3D files couldn't be found." << endl
<< "Make sure you have either the platform SDK AND the DirectShow SDK or the Windows SDK installed." << endl
<< "If you have the DirectShow SDK installed, please make sure that you have run the <path to SDK>\\SetEnv.Cmd script." << endl;
if (!findFile("vmr9.h")) cout << "vmr9.h not found" << endl;
if (!findFile("dshow.h")) cout << "dshow.h not found" << endl;
if (!findFile("strmiids.lib")) cout << "strmiids.lib not found" << endl;
if (!findFile("dmoguids.lib")) cout << "dmoguids.lib not found" << endl;
if (!findFile("msdmo.lib")) cout << "msdmo.lib not found" << endl;
if (!findFile("d3d9.h")) cout << "d3d9.h not found" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
} else if (part == "WMSDK") {
available = findFile("wmsdk.h");
Add V8 snapshot support A V8 snapshot is a serialized representation of the JavaScript heap. Using a snapshot can vastly speed up V8 initialization. This commit introduces a new tool, mkv8snapshot. mkv8snapshot is automatically invoked as part of building QtV8, and generates a .cpp file which is compiled into the QtV8 library. Because mkv8snapshot itself needs to initialize the V8 environment the non-snapshot way (i.e., by evaluating thousands of lines of JavaScript), it needs to build all of V8. This means that V8 is effectively built twice when snapshots are enabled. When cross-compiling, only host=i386 and target=arm is supported, since that's the only relevant case for which V8 currently supports a simulator. mkv8snapshot is built and run as a host tool (using the simulator), and generates a snapshot that will be used on the target. Task-number: QTBUG-21152 Change-Id: I9270652f129505508f78db8b0a39fbf57dc8b86d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-11-18 08:48:54 +00:00
} else if (part == "V8SNAPSHOT") {
available = true;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
} else if (part == "AUDIO_BACKEND") {
available = true;
} else if (part == "DIRECTWRITE") {
available = findFile("dwrite.h") && findFile("d2d1.h") && findFile("dwrite.lib");
}
return available;
}
/*
Autodetect options marked as "auto".
*/
void Configure::autoDetection()
{
// Style detection
if (dictionary["STYLE_WINDOWSXP"] == "auto")
dictionary["STYLE_WINDOWSXP"] = checkAvailability("STYLE_WINDOWSXP") ? defaultTo("STYLE_WINDOWSXP") : "no";
if (dictionary["STYLE_WINDOWSVISTA"] == "auto") // Vista style has the same requirements as XP style
dictionary["STYLE_WINDOWSVISTA"] = checkAvailability("STYLE_WINDOWSXP") ? defaultTo("STYLE_WINDOWSVISTA") : "no";
// Compression detection
if (dictionary["ZLIB"] == "auto")
dictionary["ZLIB"] = checkAvailability("ZLIB") ? defaultTo("ZLIB") : "qt";
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
// PCRE detection
if (dictionary["PCRE"] == "auto")
dictionary["PCRE"] = checkAvailability("PCRE") ? defaultTo("PCRE") : "qt";
Add support for ICU on Windows Needed by QtWebKit now. Change-Id: I177d8dcf6063a14501f7ba3081b43a29a48661c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-08 02:51:27 +00:00
// ICU detection
if (dictionary["ICU"] == "auto")
dictionary["ICU"] = checkAvailability("ICU") ? "yes" : "no";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Image format detection
if (dictionary["GIF"] == "auto")
dictionary["GIF"] = defaultTo("GIF");
if (dictionary["JPEG"] == "auto")
dictionary["JPEG"] = defaultTo("JPEG");
if (dictionary["PNG"] == "auto")
dictionary["PNG"] = defaultTo("PNG");
if (dictionary["LIBJPEG"] == "auto")
dictionary["LIBJPEG"] = checkAvailability("LIBJPEG") ? defaultTo("LIBJPEG") : "qt";
if (dictionary["LIBPNG"] == "auto")
dictionary["LIBPNG"] = checkAvailability("LIBPNG") ? defaultTo("LIBPNG") : "qt";
// SQL detection (not on by default)
if (dictionary["SQL_MYSQL"] == "auto")
dictionary["SQL_MYSQL"] = checkAvailability("SQL_MYSQL") ? defaultTo("SQL_MYSQL") : "no";
if (dictionary["SQL_ODBC"] == "auto")
dictionary["SQL_ODBC"] = checkAvailability("SQL_ODBC") ? defaultTo("SQL_ODBC") : "no";
if (dictionary["SQL_OCI"] == "auto")
dictionary["SQL_OCI"] = checkAvailability("SQL_OCI") ? defaultTo("SQL_OCI") : "no";
if (dictionary["SQL_PSQL"] == "auto")
dictionary["SQL_PSQL"] = checkAvailability("SQL_PSQL") ? defaultTo("SQL_PSQL") : "no";
if (dictionary["SQL_TDS"] == "auto")
dictionary["SQL_TDS"] = checkAvailability("SQL_TDS") ? defaultTo("SQL_TDS") : "no";
if (dictionary["SQL_DB2"] == "auto")
dictionary["SQL_DB2"] = checkAvailability("SQL_DB2") ? defaultTo("SQL_DB2") : "no";
if (dictionary["SQL_SQLITE"] == "auto")
dictionary["SQL_SQLITE"] = checkAvailability("SQL_SQLITE") ? defaultTo("SQL_SQLITE") : "no";
if (dictionary["SQL_SQLITE_LIB"] == "system")
if (!checkAvailability("SQL_SQLITE_LIB"))
dictionary["SQL_SQLITE_LIB"] = "no";
if (dictionary["SQL_SQLITE2"] == "auto")
dictionary["SQL_SQLITE2"] = checkAvailability("SQL_SQLITE2") ? defaultTo("SQL_SQLITE2") : "no";
if (dictionary["SQL_IBASE"] == "auto")
dictionary["SQL_IBASE"] = checkAvailability("SQL_IBASE") ? defaultTo("SQL_IBASE") : "no";
if (dictionary["SSE2"] == "auto")
dictionary["SSE2"] = checkAvailability("SSE2") ? "yes" : "no";
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
if (dictionary["SSE3"] == "auto")
dictionary["SSE3"] = checkAvailability("SSE3") ? "yes" : "no";
if (dictionary["SSSE3"] == "auto")
dictionary["SSSE3"] = checkAvailability("SSSE3") ? "yes" : "no";
if (dictionary["SSE4_1"] == "auto")
dictionary["SSE4_1"] = checkAvailability("SSE4_1") ? "yes" : "no";
if (dictionary["SSE4_2"] == "auto")
dictionary["SSE4_2"] = checkAvailability("SSE4_2") ? "yes" : "no";
if (dictionary["AVX"] == "auto")
dictionary["AVX"] = checkAvailability("AVX") ? "yes" : "no";
if (dictionary["AVX2"] == "auto")
dictionary["AVX2"] = checkAvailability("AVX2") ? "yes" : "no";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["IWMMXT"] == "auto")
dictionary["IWMMXT"] = checkAvailability("IWMMXT") ? "yes" : "no";
if (dictionary["OPENSSL"] == "auto")
dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no";
if (dictionary["DBUS"] == "auto")
dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no";
Add V8 snapshot support A V8 snapshot is a serialized representation of the JavaScript heap. Using a snapshot can vastly speed up V8 initialization. This commit introduces a new tool, mkv8snapshot. mkv8snapshot is automatically invoked as part of building QtV8, and generates a .cpp file which is compiled into the QtV8 library. Because mkv8snapshot itself needs to initialize the V8 environment the non-snapshot way (i.e., by evaluating thousands of lines of JavaScript), it needs to build all of V8. This means that V8 is effectively built twice when snapshots are enabled. When cross-compiling, only host=i386 and target=arm is supported, since that's the only relevant case for which V8 currently supports a simulator. mkv8snapshot is built and run as a host tool (using the simulator), and generates a snapshot that will be used on the target. Task-number: QTBUG-21152 Change-Id: I9270652f129505508f78db8b0a39fbf57dc8b86d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-11-18 08:48:54 +00:00
if (dictionary["V8SNAPSHOT"] == "auto")
dictionary["V8SNAPSHOT"] = (dictionary["V8"] == "yes") && checkAvailability("V8SNAPSHOT") ? "yes" : "no";
Rename the 'declarative debug support' to 'qml debug support' Since the library and almost everything got renamed to qml, we should do so for the debugging support, too. (CONFIG+=declarative_debug will continue to work for some time being, but prints a deprecated warning). Change-Id: I295155dce873e2585c1452d2bf0625ea6ce219c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-30 11:43:10 +00:00
if (dictionary["QML_DEBUG"] == "auto")
dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["AUDIO_BACKEND"] == "auto")
dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no";
if (dictionary["WMSDK"] == "auto")
dictionary["WMSDK"] = checkAvailability("WMSDK") ? "yes" : "no";
// Qt/WinCE remote test application
if (dictionary["CETEST"] == "auto")
dictionary["CETEST"] = checkAvailability("CETEST") ? "yes" : "no";
// Detection of IncrediBuild buildconsole
if (dictionary["INCREDIBUILD_XGE"] == "auto")
dictionary["INCREDIBUILD_XGE"] = checkAvailability("INCREDIBUILD_XGE") ? "yes" : "no";
// Mark all unknown "auto" to the default value..
for (QMap<QString,QString>::iterator i = dictionary.begin(); i != dictionary.end(); ++i) {
if (i.value() == "auto")
i.value() = defaultTo(i.key());
}
}
bool Configure::verifyConfiguration()
{
if (dictionary["SQL_SQLITE_LIB"] == "no" && dictionary["SQL_SQLITE"] != "no") {
cout << "WARNING: Configure could not detect the presence of a system SQLite3 lib." << endl
<< "Configure will therefore continue with the SQLite3 lib bundled with Qt." << endl
<< "(Press any key to continue..)";
if (_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
exit(0); // Exit cleanly for Ctrl+C
dictionary["SQL_SQLITE_LIB"] = "qt"; // Set to Qt's bundled lib an continue
}
if (dictionary["QMAKESPEC"].endsWith("-g++")
&& dictionary["SQL_OCI"] != "no") {
cout << "WARNING: Qt does not support compiling the Oracle database driver with" << endl
<< "MinGW, due to lack of such support from Oracle. Consider disabling the" << endl
<< "Oracle driver, as the current build will most likely fail." << endl;
cout << "(Press any key to continue..)";
if (_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
exit(0); // Exit cleanly for Ctrl+C
}
if (dictionary["QMAKESPEC"].endsWith("win32-msvc.net")) {
cout << "WARNING: The makespec win32-msvc.net is deprecated. Consider using" << endl
<< "win32-msvc2002 or win32-msvc2003 instead." << endl;
cout << "(Press any key to continue..)";
if (_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
exit(0); // Exit cleanly for Ctrl+C
}
if (0 != dictionary["ARM_FPU_TYPE"].size()) {
QStringList l= QStringList()
<< "softvfp"
<< "softvfp+vfpv2"
<< "vfpv2";
if (!(l.contains(dictionary["ARM_FPU_TYPE"])))
cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl;
}
if (dictionary["DIRECTWRITE"] == "yes" && !checkAvailability("DIRECTWRITE")) {
cout << "WARNING: To be able to compile the DirectWrite font engine you will" << endl
<< "need the Microsoft DirectWrite and Microsoft Direct2D development" << endl
<< "files such as headers and libraries." << endl
<< "(Press any key to continue..)";
if (_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
exit(0); // Exit cleanly for Ctrl+C
}
return true;
}
/*
Things that affect the Qt API/ABI:
Options:
minimal-config small-config medium-config large-config full-config
Options:
debug release
Things that do not affect the Qt API/ABI:
system-jpeg no-jpeg jpeg
system-png no-png png
system-zlib no-zlib zlib
no-gif gif
dll staticlib
nocrosscompiler
GNUmake
largefile
nis
nas
tablet
X11 : x11sm xinerama xcursor xfixes xrandr xrender fontconfig xkb
Embedded: embedded freetype
*/
void Configure::generateBuildKey()
{
QString spec = dictionary["QMAKESPEC"];
QString compiler = "msvc"; // ICC is compatible
if (spec.endsWith("-g++"))
compiler = "mingw";
else if (spec.endsWith("-borland"))
compiler = "borland";
// Build options which changes the Qt API/ABI
QStringList build_options;
if (!dictionary["QCONFIG"].isEmpty())
build_options += dictionary["QCONFIG"] + "-config ";
build_options.sort();
// Sorted defines that start with QT_NO_
QStringList build_defines = qmakeDefines.filter(QRegExp("^QT_NO_"));
build_defines.sort();
}
void Configure::generateOutputVars()
{
// Generate variables for output
QString build = dictionary[ "BUILD" ];
bool buildAll = (dictionary[ "BUILDALL" ] == "yes");
if (build == "debug") {
if (buildAll)
Do not add debug/release to QMAKE_CONFIG. Let module system enable them This solved QTBUG-26111 in which qtjsbackend gets built with an incomplete framework on Mac OSX. This was traced back to commit 6a6fd56e662b2c1a581727f7ec44d5bd60913ad4 which moved QMAKE_CONFIG values from .qmake.cache to mkspecs/qmodule.pri. Since qtjsbackend contains config tests it creates its own .qmake.cache which was previously masking this issue. QMAKE_CONFIG incorrectly contained debug for debug_and_release builds even though debug and release are already present in the CONFIG variable in mkspecs/qconfig.pri. The changes to configure prevent CONFIG in qmodule.pri from containing debug and release variables and ensure that QT_CONFIG contains build_all and debug_and_release if appropriate. Configure.app is also adjusted to match this behaviour. The other part of the change is to qt_module_config.prf and qt_plugin.prf. These changes take care of populating CONFIG with the appropriate debug_and_release and build_all variables depending upon what is present in QT_CONFIG. This ensures that the Qt modules and plugins get built with the same configuration as qtbase. The special handling for the qcocoa QPA plugin ensures that it is built in release mode only to preserve the behaviour introduced by commit 5603f94eaa538dbe28fc426065d65a27799adedc. Task-number: QTBUG-26111 Change-Id: I6f65aba50709e1b2431b8b4411ff30a06f7d8aed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-12 11:30:13 +00:00
qtConfig += "debug_and_release build_all release";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qtConfig += "debug";
} else if (build == "release") {
if (buildAll)
Do not add debug/release to QMAKE_CONFIG. Let module system enable them This solved QTBUG-26111 in which qtjsbackend gets built with an incomplete framework on Mac OSX. This was traced back to commit 6a6fd56e662b2c1a581727f7ec44d5bd60913ad4 which moved QMAKE_CONFIG values from .qmake.cache to mkspecs/qmodule.pri. Since qtjsbackend contains config tests it creates its own .qmake.cache which was previously masking this issue. QMAKE_CONFIG incorrectly contained debug for debug_and_release builds even though debug and release are already present in the CONFIG variable in mkspecs/qconfig.pri. The changes to configure prevent CONFIG in qmodule.pri from containing debug and release variables and ensure that QT_CONFIG contains build_all and debug_and_release if appropriate. Configure.app is also adjusted to match this behaviour. The other part of the change is to qt_module_config.prf and qt_plugin.prf. These changes take care of populating CONFIG with the appropriate debug_and_release and build_all variables depending upon what is present in QT_CONFIG. This ensures that the Qt modules and plugins get built with the same configuration as qtbase. The special handling for the qcocoa QPA plugin ensures that it is built in release mode only to preserve the behaviour introduced by commit 5603f94eaa538dbe28fc426065d65a27799adedc. Task-number: QTBUG-26111 Change-Id: I6f65aba50709e1b2431b8b4411ff30a06f7d8aed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-12 11:30:13 +00:00
qtConfig += "debug_and_release build_all debug";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qtConfig += "release";
}
Add Qt Widgets opt out support to build system There should be a clear QWidget free path for people with no interest in legacy QWidget functionality. Adding this option to configure makes this path readily accessible and hence testable. Change-Id: If87c1063fcf4c46f5280836126c11999feaa9f8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-07 00:11:44 +00:00
if (dictionary[ "WIDGETS" ] == "no")
qtConfig += "no-widgets";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Compression --------------------------------------------------
if (dictionary[ "ZLIB" ] == "qt")
qtConfig += "zlib";
else if (dictionary[ "ZLIB" ] == "system")
qtConfig += "system-zlib";
QRegularExpression: configure support for PCRE Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 22:31:13 +00:00
// PCRE ---------------------------------------------------------
if (dictionary[ "PCRE" ] == "qt")
qmakeConfig += "pcre";
Add support for ICU on Windows Needed by QtWebKit now. Change-Id: I177d8dcf6063a14501f7ba3081b43a29a48661c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-08 02:51:27 +00:00
// ICU ---------------------------------------------------------
if (dictionary[ "ICU" ] == "yes")
qtConfig += "icu";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Image formates -----------------------------------------------
if (dictionary[ "GIF" ] == "no")
qtConfig += "no-gif";
else if (dictionary[ "GIF" ] == "yes")
qtConfig += "gif";
if (dictionary[ "JPEG" ] == "no")
qtConfig += "no-jpeg";
else if (dictionary[ "JPEG" ] == "yes")
qtConfig += "jpeg";
if (dictionary[ "LIBJPEG" ] == "system")
qtConfig += "system-jpeg";
if (dictionary[ "PNG" ] == "no")
qtConfig += "no-png";
else if (dictionary[ "PNG" ] == "yes")
qtConfig += "png";
if (dictionary[ "LIBPNG" ] == "system")
qtConfig += "system-png";
// Text rendering --------------------------------------------------
if (dictionary[ "FREETYPE" ] == "yes")
qtConfig += "freetype";
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
else if (dictionary[ "FREETYPE" ] == "system")
qtConfig += "system-freetype";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Styles -------------------------------------------------------
if (dictionary[ "STYLE_WINDOWS" ] == "yes")
qmakeStyles += "windows";
if (dictionary[ "STYLE_PLASTIQUE" ] == "yes")
qmakeStyles += "plastique";
if (dictionary[ "STYLE_CLEANLOOKS" ] == "yes")
qmakeStyles += "cleanlooks";
if (dictionary[ "STYLE_WINDOWSXP" ] == "yes")
qmakeStyles += "windowsxp";
if (dictionary[ "STYLE_WINDOWSVISTA" ] == "yes")
qmakeStyles += "windowsvista";
if (dictionary[ "STYLE_MOTIF" ] == "yes")
qmakeStyles += "motif";
if (dictionary[ "STYLE_SGI" ] == "yes")
qmakeStyles += "sgi";
if (dictionary[ "STYLE_WINDOWSCE" ] == "yes")
qmakeStyles += "windowsce";
if (dictionary[ "STYLE_WINDOWSMOBILE" ] == "yes")
qmakeStyles += "windowsmobile";
if (dictionary[ "STYLE_CDE" ] == "yes")
qmakeStyles += "cde";
// Databases ----------------------------------------------------
if (dictionary[ "SQL_MYSQL" ] == "yes")
qmakeSql += "mysql";
else if (dictionary[ "SQL_MYSQL" ] == "plugin")
qmakeSqlPlugins += "mysql";
if (dictionary[ "SQL_ODBC" ] == "yes")
qmakeSql += "odbc";
else if (dictionary[ "SQL_ODBC" ] == "plugin")
qmakeSqlPlugins += "odbc";
if (dictionary[ "SQL_OCI" ] == "yes")
qmakeSql += "oci";
else if (dictionary[ "SQL_OCI" ] == "plugin")
qmakeSqlPlugins += "oci";
if (dictionary[ "SQL_PSQL" ] == "yes")
qmakeSql += "psql";
else if (dictionary[ "SQL_PSQL" ] == "plugin")
qmakeSqlPlugins += "psql";
if (dictionary[ "SQL_TDS" ] == "yes")
qmakeSql += "tds";
else if (dictionary[ "SQL_TDS" ] == "plugin")
qmakeSqlPlugins += "tds";
if (dictionary[ "SQL_DB2" ] == "yes")
qmakeSql += "db2";
else if (dictionary[ "SQL_DB2" ] == "plugin")
qmakeSqlPlugins += "db2";
if (dictionary[ "SQL_SQLITE" ] == "yes")
qmakeSql += "sqlite";
else if (dictionary[ "SQL_SQLITE" ] == "plugin")
qmakeSqlPlugins += "sqlite";
if (dictionary[ "SQL_SQLITE_LIB" ] == "system")
qmakeConfig += "system-sqlite";
if (dictionary[ "SQL_SQLITE2" ] == "yes")
qmakeSql += "sqlite2";
else if (dictionary[ "SQL_SQLITE2" ] == "plugin")
qmakeSqlPlugins += "sqlite2";
if (dictionary[ "SQL_IBASE" ] == "yes")
qmakeSql += "ibase";
else if (dictionary[ "SQL_IBASE" ] == "plugin")
qmakeSqlPlugins += "ibase";
// Other options ------------------------------------------------
if (dictionary[ "BUILDALL" ] == "yes") {
Ensure build_all is propagated to all modules when appropriate. If qtbase was configured to build both debug and release versions of libraries, it makes sense for any modules we are building to do the same by default. Change-Id: Idb5f78a7414b6ed2bacf295ad01f259fca435410 Reviewed-on: http://codereview.qt-project.org/4702 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-12 22:53:40 +00:00
qtConfig += "build_all";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
qmakeConfig += dictionary[ "BUILD" ];
dictionary[ "QMAKE_OUTDIR" ] = dictionary[ "BUILD" ];
Remove 'tests' as default build part. This requires 'configure -make tests' if you want to automatically build autotests for a module by default. You can still go into the individual tests/ directories and 'qmake && make check' to build and run the autotests. configure -developer-build will enable the tests by default, like it did in Qt4. Change-Id: If4d870987de0947a8328509dcc227fa9e6284201 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:15:22 +00:00
if (buildParts.isEmpty()) {
Sync configure with Unix version (-make/-nomake) Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:09:59 +00:00
buildParts = defaultBuildParts;
Remove 'tests' as default build part. This requires 'configure -make tests' if you want to automatically build autotests for a module by default. You can still go into the individual tests/ directories and 'qmake && make check' to build and run the autotests. configure -developer-build will enable the tests by default, like it did in Qt4. Change-Id: If4d870987de0947a8328509dcc227fa9e6284201 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:15:22 +00:00
if (dictionary["BUILDDEV"] == "yes")
buildParts += "tests";
}
Sync configure with Unix version (-make/-nomake) Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-21 10:09:59 +00:00
while (!nobuildParts.isEmpty())
buildParts.removeAll(nobuildParts.takeFirst());
if (!buildParts.contains("libs"))
buildParts += "libs";
buildParts.removeDuplicates();
Windows configure: make -mp affect the Qt build itself Before -mp and -no-mp affected only projects built with Qt. There was no way to turn off msvc_mp for the Qt build. Qt projects can add msvc_mp themselves. Task-number: QTBUG-23929 Change-Id: I08b9ec762c59d2604635d73396044a74f717728c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-01 10:19:27 +00:00
if (dictionary["MSVC_MP"] == "yes")
qmakeConfig += "msvc_mp";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary[ "SHARED" ] == "yes") {
QString version = dictionary[ "VERSION" ];
if (!version.isEmpty()) {
qmakeVars += "QMAKE_QT_VERSION_OVERRIDE = " + version.left(version.indexOf("."));
version.remove(QLatin1Char('.'));
}
dictionary[ "QMAKE_OUTDIR" ] += "_shared";
} else {
dictionary[ "QMAKE_OUTDIR" ] += "_static";
}
if (dictionary[ "ACCESSIBILITY" ] == "yes")
qtConfig += "accessibility";
if (!qmakeLibs.isEmpty())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
qmakeVars += "LIBS += " + formatPaths(qmakeLibs);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
qmakeVars += "QT_LFLAGS_SQLITE += " + formatPath(dictionary["QT_LFLAGS_SQLITE"]);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary[ "OPENGL" ] == "yes")
qtConfig += "opengl";
if (dictionary["OPENGL_ES_CM"] == "yes") {
qtConfig += "opengles1";
qtConfig += "egl";
}
if (dictionary["OPENGL_ES_2"] == "yes") {
qtConfig += "opengles2";
qtConfig += "egl";
}
if (dictionary["OPENVG"] == "yes") {
qtConfig += "openvg";
qtConfig += "egl";
}
Remove dead code from the configures This removes the options to disable several modules, as they are in separate repositories now and can be "disabled" by simply not compiling them. Note that this leaves some configuration options for these separate modules in, as they have no own configures. This is ugly, but has to stay that way for the time being. Some other dead code had to go as well, just like accepting the obsolete -qdbus option. Change-Id: Ibb26e4f48ca8239c2c4396e4abefab4c87322be2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-01-26 17:43:06 +00:00
// ### Vestige
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["DIRECTSHOW"] == "yes")
qtConfig += "directshow";
if (dictionary[ "OPENSSL" ] == "yes")
qtConfig += "openssl";
else if (dictionary[ "OPENSSL" ] == "linked")
qtConfig += "openssl-linked";
if (dictionary[ "DBUS" ] == "yes")
qtConfig += "dbus";
else if (dictionary[ "DBUS" ] == "linked")
qtConfig += "dbus dbus-linked";
if (dictionary[ "CETEST" ] == "yes")
qtConfig += "cetest";
Remove dead code from the configures This removes the options to disable several modules, as they are in separate repositories now and can be "disabled" by simply not compiling them. Note that this leaves some configuration options for these separate modules in, as they have no own configures. This is ugly, but has to stay that way for the time being. Some other dead code had to go as well, just like accepting the obsolete -qdbus option. Change-Id: Ibb26e4f48ca8239c2c4396e4abefab4c87322be2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-01-26 17:43:06 +00:00
// ### Vestige
if (dictionary["PHONON_BACKEND"] == "yes")
qtConfig += "phonon-backend";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Remove dead code from the configures This removes the options to disable several modules, as they are in separate repositories now and can be "disabled" by simply not compiling them. Note that this leaves some configuration options for these separate modules in, as they have no own configures. This is ugly, but has to stay that way for the time being. Some other dead code had to go as well, just like accepting the obsolete -qdbus option. Change-Id: Ibb26e4f48ca8239c2c4396e4abefab4c87322be2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-01-26 17:43:06 +00:00
// ### Vestige
if (dictionary["AUDIO_BACKEND"] == "yes")
qtConfig += "audio-backend";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["DIRECTWRITE"] == "yes")
qtConfig += "directwrite";
if (dictionary[ "NATIVE_GESTURES" ] == "yes")
qtConfig += "native-gestures";
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
qtConfig += "qpa";
if (dictionary["NIS"] == "yes")
qtConfig += "nis";
if (dictionary["QT_CUPS"] == "yes")
qtConfig += "cups";
if (dictionary["QT_ICONV"] == "yes")
qtConfig += "iconv";
else if (dictionary["QT_ICONV"] == "sun")
qtConfig += "sun-libiconv";
else if (dictionary["QT_ICONV"] == "gnu")
qtConfig += "gnu-libiconv";
if (dictionary["FONT_CONFIG"] == "yes") {
qtConfig += "fontconfig";
qmakeVars += "QMAKE_CFLAGS_FONTCONFIG =";
qmakeVars += "QMAKE_LIBS_FONTCONFIG = -lfreetype -lfontconfig";
}
if (dictionary["QT_GLIB"] == "yes")
qtConfig += "glib";
Add concurrent to QT_CONFIG also on Windows It was forgotten in 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I1ed9a60983f978d89615ae91c99f5c02ffe57f7c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-26 11:52:44 +00:00
// We currently have no switch for QtConcurrent, so add it unconditionally.
qtConfig += "concurrent";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Remove dead code from the configures This removes the options to disable several modules, as they are in separate repositories now and can be "disabled" by simply not compiling them. Note that this leaves some configuration options for these separate modules in, as they have no own configures. This is ugly, but has to stay that way for the time being. Some other dead code had to go as well, just like accepting the obsolete -qdbus option. Change-Id: Ibb26e4f48ca8239c2c4396e4abefab4c87322be2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-01-26 17:43:06 +00:00
// ### Vestige
if (dictionary[ "V8SNAPSHOT" ] == "yes")
qtConfig += "v8snapshot";
configure on Windows: Store result of V8 configuration Otherwise V8 won't be built (there's a contains() check in src.pro). Change-Id: Iba65e85baae1e80800e5ca0da49fde8958dfd659 Reviewed-on: http://codereview.qt-project.org/4524 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-09 10:25:32 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Add config levels --------------------------------------------
QStringList possible_configs = QStringList()
<< "minimal"
<< "small"
<< "medium"
<< "large"
<< "full";
QString set_config = dictionary["QCONFIG"];
if (possible_configs.contains(set_config)) {
foreach (const QString &cfg, possible_configs) {
qtConfig += (cfg + "-config");
if (cfg == set_config)
break;
}
}
Add cross_compile to qconfig.pri for global advertising .qmake.cache is not necessarily accessible to other modules which depend on information about whether we are cross compiling or not. We might as well advertise this fact globally via the CONFIG variable in qconfig.pri. Change-Id: I6dee3e6604e5ca1c775c5f9f834fe29b4e27adb8 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
2012-02-29 23:55:13 +00:00
if (dictionary.contains("XQMAKESPEC") && (dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"])) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qmakeConfig += "cross_compile";
Add cross_compile to qconfig.pri for global advertising .qmake.cache is not necessarily accessible to other modules which depend on information about whether we are cross compiling or not. We might as well advertise this fact globally via the CONFIG variable in qconfig.pri. Change-Id: I6dee3e6604e5ca1c775c5f9f834fe29b4e27adb8 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
2012-02-29 23:55:13 +00:00
dictionary["CROSS_COMPILE"] = "yes";
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Directories and settings for .qmake.cache --------------------
// if QT_INSTALL_* have not been specified on commandline, define them now from QT_INSTALL_PREFIX
// if prefix is empty (WINCE), make all of them empty, if they aren't set
bool qipempty = false;
if (dictionary[ "QT_INSTALL_PREFIX" ].isEmpty())
qipempty = true;
if (!dictionary[ "QT_INSTALL_DOCS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_DOCS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/doc";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_HEADERS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_HEADERS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/include";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_LIBS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_LIBS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/lib";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_BINS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_BINS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/bin";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_PLUGINS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_PLUGINS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/plugins";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_IMPORTS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_IMPORTS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/imports";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_DATA" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_DATA" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ];
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_TRANSLATIONS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_TRANSLATIONS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/translations";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary[ "QT_INSTALL_EXAMPLES" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_EXAMPLES" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/examples";
Added build system support for installing tests. Tests will install under $$[QT_INSTALL_TESTS]. TESTDATA may be used to install additional testdata required by the test. The default install rule may be disabled by CONFIG+=no_testcase_installs. Change-Id: I204de60c8e844775906ffd016ca50bffbb414142 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-17 05:39:19 +00:00
if (!dictionary[ "QT_INSTALL_TESTS" ].size())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_INSTALL_TESTS" ] = qipempty ? "" : dictionary[ "QT_INSTALL_PREFIX" ] + "/tests";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
bool haveHpx = false;
if (dictionary[ "QT_HOST_PREFIX" ].isEmpty())
dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ];
else
haveHpx = true;
if (dictionary[ "QT_HOST_BINS" ].isEmpty())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
dictionary[ "QT_HOST_BINS" ] = haveHpx ? dictionary[ "QT_HOST_PREFIX" ] + "/bin" : dictionary[ "QT_INSTALL_BINS" ];
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
if (dictionary[ "QT_HOST_DATA" ].isEmpty())
dictionary[ "QT_HOST_DATA" ] = haveHpx ? dictionary[ "QT_HOST_PREFIX" ] : dictionary[ "QT_INSTALL_DATA" ];
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary.contains("XQMAKESPEC") && dictionary[ "XQMAKESPEC" ].startsWith("linux"))
dictionary[ "QMAKE_RPATHDIR" ] = dictionary[ "QT_INSTALL_LIBS" ];
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
qmakeVars += QString("OBJECTS_DIR = ") + formatPath("tmp/obj/" + dictionary["QMAKE_OUTDIR"]);
qmakeVars += QString("MOC_DIR = ") + formatPath("tmp/moc/" + dictionary["QMAKE_OUTDIR"]);
qmakeVars += QString("RCC_DIR = ") + formatPath("tmp/rcc/" + dictionary["QMAKE_OUTDIR"]);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!qmakeDefines.isEmpty())
qmakeVars += QString("DEFINES += ") + qmakeDefines.join(" ");
if (!qmakeIncludes.isEmpty())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
qmakeVars += QString("INCLUDEPATH += ") + formatPaths(qmakeIncludes);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!opensslLibs.isEmpty())
qmakeVars += opensslLibs;
remove symbian support from configure Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-07 09:16:21 +00:00
else if (dictionary[ "OPENSSL" ] == "linked")
qmakeVars += QString("OPENSSL_LIBS = -lssleay32 -llibeay32");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!psqlLibs.isEmpty())
qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);
{
QStringList lflagsTDS;
if (!sybase.isEmpty())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
lflagsTDS += QString("-L") + formatPath(sybase.section("=", 1) + "/lib");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!sybaseLibs.isEmpty())
lflagsTDS += sybaseLibs.section("=", 1);
if (!lflagsTDS.isEmpty())
qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(" ");
}
if (!qmakeSql.isEmpty())
qmakeVars += QString("sql-drivers += ") + qmakeSql.join(" ");
if (!qmakeSqlPlugins.isEmpty())
qmakeVars += QString("sql-plugins += ") + qmakeSqlPlugins.join(" ");
if (!qmakeStyles.isEmpty())
qmakeVars += QString("styles += ") + qmakeStyles.join(" ");
if (!qmakeStylePlugins.isEmpty())
qmakeVars += QString("style-plugins += ") + qmakeStylePlugins.join(" ");
if (dictionary["QMAKESPEC"].endsWith("-g++")) {
QString includepath = qgetenv("INCLUDE");
bool hasSh = Environment::detectExecutable("sh.exe");
QChar separator = (!includepath.contains(":\\") && hasSh ? QChar(':') : QChar(';'));
qmakeVars += QString("TMPPATH = $$quote($$(INCLUDE))");
qmakeVars += QString("QMAKE_INCDIR_POST += $$split(TMPPATH,\"%1\")").arg(separator);
qmakeVars += QString("TMPPATH = $$quote($$(LIB))");
qmakeVars += QString("QMAKE_LIBDIR_POST += $$split(TMPPATH,\"%1\")").arg(separator);
}
if (!dictionary[ "QMAKESPEC" ].length()) {
cout << "Configure could not detect your compiler. QMAKESPEC must either" << endl
<< "be defined as an environment variable, or specified as an" << endl
<< "argument with -platform" << endl;
dictionary[ "HELP" ] = "yes";
QStringList winPlatforms;
QDir mkspecsDir(sourcePath + "/mkspecs");
const QFileInfoList &specsList = mkspecsDir.entryInfoList();
for (int i = 0; i < specsList.size(); ++i) {
const QFileInfo &fi = specsList.at(i);
if (fi.fileName().left(5) == "win32") {
winPlatforms += fi.fileName();
}
}
cout << "Available platforms are: " << qPrintable(winPlatforms.join(", ")) << endl;
dictionary[ "DONE" ] = "error";
}
}
#if !defined(EVAL)
void Configure::generateCachefile()
{
// Generate .qmake.cache
QFile cacheFile(buildPath + "/.qmake.cache");
if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
QTextStream cacheStream(&cacheFile);
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
cacheStream << "include($$PWD/mkspecs/qmodule.pri)" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
cacheStream << (*var) << endl;
}
rip out -incremental from configure the feature is rather obscure and unlikely to be used by anyone. Change-Id: I2dfb4ca4d5d1f210d385c013f46bc6389fd6ea2d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-02 18:30:00 +00:00
cacheStream << "CONFIG += " << qmakeConfig.join(" ") << "depend_includepath no_private_qt_headers_warning QTDIR_build" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
cacheStream.flush();
cacheFile.close();
}
// Generate qmodule.pri
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
QFile moduleFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri");
if (moduleFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
QTextStream moduleStream(&moduleFile);
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "#paths" << endl;
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
moduleStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl;
moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl;
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl;
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
introduce ability to build projects for the host system when qmake runs into the new option(host_build) command, it will restart the project evaluation with a host spec. the new default host spec is called default-host (gasp!). it is overridden with the pre-exising -spec / -platform option, while the new -xspec / -xplatform option overrides the pre-existing default spec. specifying -spec but not -xspec will set the xspec, too, so the behavior is backwards-compatible. same for the XQMAKESPEC override read from .qmake.cache and the environment variable. the cleaner solution would be adding -hostspec, to be symmetrical with the override semantics, but that would deviate from configure in turn. Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-31 17:36:18 +00:00
QString hostSpec = dictionary[ "QMAKESPEC" ];
QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : hostSpec;
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString xmkspec_path = sourcePath + "/mkspecs/" + targetSpec;
introduce ability to build projects for the host system when qmake runs into the new option(host_build) command, it will restart the project evaluation with a host spec. the new default host spec is called default-host (gasp!). it is overridden with the pre-exising -spec / -platform option, while the new -xspec / -xplatform option overrides the pre-existing default spec. specifying -spec but not -xspec will set the xspec, too, so the behavior is backwards-compatible. same for the XQMAKESPEC override read from .qmake.cache and the environment variable. the cleaner solution would be adding -hostspec, to be symmetrical with the override semantics, but that would deviate from configure in turn. Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-31 17:36:18 +00:00
if (QFile::exists(xmkspec_path))
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
moduleStream << "XQMAKESPEC = " << xmkspec_path << endl;
introduce ability to build projects for the host system when qmake runs into the new option(host_build) command, it will restart the project evaluation with a host spec. the new default host spec is called default-host (gasp!). it is overridden with the pre-exising -spec / -platform option, while the new -xspec / -xplatform option overrides the pre-existing default spec. specifying -spec but not -xspec will set the xspec, too, so the behavior is backwards-compatible. same for the XQMAKESPEC override read from .qmake.cache and the environment variable. the cleaner solution would be adding -hostspec, to be symmetrical with the override semantics, but that would deviate from configure in turn. Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-31 17:36:18 +00:00
else
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
moduleStream << "XQMAKESPEC = " << targetSpec << endl;
QString mkspec_path = sourcePath + "/mkspecs/" + hostSpec;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (QFile::exists(mkspec_path))
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
moduleStream << "QMAKESPEC = " << mkspec_path << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
moduleStream << "QMAKESPEC = " << hostSpec << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["CETEST"] == "yes") {
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
moduleStream << "QT_CE_RAPI_INC = " << formatPath(dictionary["QT_CE_RAPI_INC"]) << endl;
moduleStream << "QT_CE_RAPI_LIB = " << formatPath(dictionary["QT_CE_RAPI_LIB"]) << endl;
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
}
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "#Qt for Windows CE c-runtime deployment" << endl
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
<< "QT_CE_C_RUNTIME = " << formatPath(dictionary["CE_CRT"]) << endl;
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
if (dictionary["CE_SIGNATURE"] != QLatin1String("no"))
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl;
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// embedded
if (!dictionary["KBD_DRIVERS"].isEmpty())
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary["GFX_DRIVERS"].isEmpty())
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary["MOUSE_DRIVERS"].isEmpty())
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!dictionary["DECORATIONS"].isEmpty())
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move the sub-architecture feature to better places in qmake Instead of saving the ability of the compiler to produce SSE2, AVX, Neon, etc. code in .qmake.cache (Unix) or qconfig.pri (Windows), move everything to qmodule.pri. Accordingly, move the DEFINES += settings to qt_module.prf instead of qt.prf. This allows us to re-use these settings in other Qt modules (other than qtbase), if necessary. Though currently the extra compiler definitions are found only in src/gui/gui.pro. They can be moved elsewhere when it becomes necessary. As a side-effect of this change, some other flags are moved from .qmake.cache to qmodule.pri (on Unix). The flags that are getting moved should probably be moved anyway. Change-Id: Ibc3ab0111e148d81870772f9357273660aa93417 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-30 12:44:39 +00:00
moduleStream << "CONFIG += create_prl link_prl";
if (dictionary[ "SSE2" ] == "yes")
moduleStream << " sse2";
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
if (dictionary[ "SSE3" ] == "yes")
moduleStream << " sse3";
if (dictionary[ "SSSE3" ] == "yes")
moduleStream << " ssse3";
if (dictionary[ "SSE4_1" ] == "yes")
moduleStream << " sse4_1";
if (dictionary[ "SSE4_2" ] == "yes")
moduleStream << " sse4_2";
if (dictionary[ "AVX" ] == "yes")
moduleStream << " avx";
if (dictionary[ "AVX2" ] == "yes")
moduleStream << " avx2";
Move the sub-architecture feature to better places in qmake Instead of saving the ability of the compiler to produce SSE2, AVX, Neon, etc. code in .qmake.cache (Unix) or qconfig.pri (Windows), move everything to qmodule.pri. Accordingly, move the DEFINES += settings to qt_module.prf instead of qt.prf. This allows us to re-use these settings in other Qt modules (other than qtbase), if necessary. Though currently the extra compiler definitions are found only in src/gui/gui.pro. They can be moved elsewhere when it becomes necessary. As a side-effect of this change, some other flags are moved from .qmake.cache to qmodule.pri (on Unix). The flags that are getting moved should probably be moved anyway. Change-Id: Ibc3ab0111e148d81870772f9357273660aa93417 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-30 12:44:39 +00:00
if (dictionary[ "IWMMXT" ] == "yes")
moduleStream << " iwmmxt";
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
if (dictionary[ "NEON" ] == "yes")
moduleStream << " neon";
if (dictionary[ "LARGE_FILE" ] == "yes")
moduleStream << " largefile";
Move the sub-architecture feature to better places in qmake Instead of saving the ability of the compiler to produce SSE2, AVX, Neon, etc. code in .qmake.cache (Unix) or qconfig.pri (Windows), move everything to qmodule.pri. Accordingly, move the DEFINES += settings to qt_module.prf instead of qt.prf. This allows us to re-use these settings in other Qt modules (other than qtbase), if necessary. Though currently the extra compiler definitions are found only in src/gui/gui.pro. They can be moved elsewhere when it becomes necessary. As a side-effect of this change, some other flags are moved from .qmake.cache to qmodule.pri (on Unix). The flags that are getting moved should probably be moved anyway. Change-Id: Ibc3ab0111e148d81870772f9357273660aa93417 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-30 12:44:39 +00:00
moduleStream << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Remove hardcoded modules in configure and QT_CONFIG Also, - Turn qt3support into gui-qt3support, to support turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe
2011-03-21 15:02:39 +00:00
moduleStream.flush();
moduleFile.close();
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
}
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
struct ArchData {
const char *qmakespec;
const char *key;
const char *subarchKey;
const char *type;
ArchData() {}
ArchData(const char *t, const char *qm, const char *k, const char *sak)
: qmakespec(qm), key(k), subarchKey(sak), type(t)
{}
};
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
/*
Runs qmake on config.tests/arch/arch.pro, which will detect the target arch
for the compiler we are using
*/
void Configure::detectArch()
{
QString oldpwd = QDir::currentPath();
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString newpwd = QString("%1/config.tests/arch").arg(buildPath);
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
if (!QDir().exists(newpwd) && !QDir().mkpath(newpwd)) {
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
cout << "Failed to create directory " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl;
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
dictionary["DONE"] = "error";
return;
}
if (!QDir::setCurrent(newpwd)) {
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
cout << "Failed to change working directory to " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl;
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
dictionary["DONE"] = "error";
return;
}
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
QVector<ArchData> qmakespecs;
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
if (dictionary.contains("XQMAKESPEC"))
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
qmakespecs << ArchData("target", "XQMAKESPEC", "QT_ARCH", "QT_CPU_FEATURES");
qmakespecs << ArchData("host", "QMAKESPEC", "QT_HOST_ARCH", "QT_HOST_CPU_FEATURES");
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
for (int i = 0; i < qmakespecs.count(); ++i) {
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
const ArchData &data = qmakespecs.at(i);
QString qmakespec = dictionary.value(data.qmakespec);
QString key = data.key;
QString subarchKey = data.subarchKey;
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
// run qmake
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString command = QString("%1 -spec %2 %3 2>&1")
.arg(QDir::toNativeSeparators(buildPath + "/bin/qmake.exe"),
QDir::toNativeSeparators(qmakespec),
QDir::toNativeSeparators(sourcePath + "/config.tests/arch/arch.pro"));
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
Environment::execute(command);
// compile
command = dictionary[ "MAKE" ];
if (command.contains("nmake"))
command += " /NOLOGO";
command += " -s";
Environment::execute(command);
// find the executable that was generated
QFile exe("arch.exe");
if (!exe.open(QFile::ReadOnly)) { // no Text, this is binary
Fix arch detection when cross compiling on Windows When trying to detect the target architecture, configure.exe will look for a file called 'arch.exe'. However, in some situations such as when cross-compiling on a Windows host to a Unix host, and depending on the toolchain being used, the output file generated by config.tests/arch may simply be called "arch" instead of "arch.exe", causing configure.exe to fail. This patches configure.exe to handle both naming schemes. Change-Id: I5798f716d732388c707564d4d45c4887ab3d3d9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-08 12:20:45 +00:00
exe.setFileName("arch");
if (!exe.open(QFile::ReadOnly)) {
cout << "Could not find output file: " << qPrintable(exe.errorString()) << endl;
dictionary["DONE"] = "error";
return;
}
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
}
QByteArray exeContents = exe.readAll();
exe.close();
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
static const char archMagic[] = "==Qt=magic=Qt== Architecture:";
int magicPos = exeContents.indexOf(archMagic);
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
if (magicPos == -1) {
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
cout << "Internal error, could not find the architecture of the "
<< data.type << " executable" << endl;
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
dictionary["DONE"] = "error";
return;
}
//cout << "Found magic at offset 0x" << hex << magicPos << endl;
// the conversion from QByteArray will stop at the ending NUL anyway
QString arch = QString::fromLatin1(exeContents.constData() + magicPos
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
+ sizeof(archMagic) - 1);
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
dictionary[key] = arch;
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
static const char subarchMagic[] = "==Qt=magic=Qt== Sub-architecture:";
magicPos = exeContents.indexOf(subarchMagic);
if (magicPos == -1) {
cout << "Internal error, could not find the sub-architecture of the "
<< data.type << " executable" << endl;
dictionary["DONE"] = "error";
return;
}
QString subarch = QString::fromLatin1(exeContents.constData() + magicPos
+ sizeof(subarchMagic) - 1);
dictionary[subarchKey] = subarch;
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
//cout << "Detected arch '" << qPrintable(arch) << "'\n";
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
//cout << "Detected sub-arch '" << qPrintable(subarch) << "'\n";
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
Improve the architecture-detection mechanism For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-27 17:43:45 +00:00
// clean up
Environment::execute(command + " distclean");
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
}
if (!dictionary.contains("QT_HOST_ARCH"))
dictionary["QT_HOST_ARCH"] = "unknown";
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
if (!dictionary.contains("QT_ARCH")) {
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
dictionary["QT_ARCH"] = dictionary["QT_HOST_ARCH"];
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
dictionary["QT_CPU_FEATURES"] = dictionary["QT_HOST_CPU_FEATURES"];
}
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
QDir::setCurrent(oldpwd);
}
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
bool Configure::tryCompileProject(const QString &projectPath, const QString &extraOptions)
{
QString oldpwd = QDir::currentPath();
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString newpwd = QString("%1/config.tests/%2").arg(buildPath, projectPath);
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
if (!QDir().exists(newpwd) && !QDir().mkpath(newpwd)) {
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
cout << "Failed to create directory " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl;
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
dictionary["DONE"] = "error";
return false;
}
if (!QDir::setCurrent(newpwd)) {
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
cout << "Failed to change working directory to " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl;
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
dictionary["DONE"] = "error";
return false;
}
// run qmake
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString command = QString("%1 %2 %3 2>&1")
.arg(QDir::toNativeSeparators(buildPath + "/bin/qmake.exe"),
QDir::toNativeSeparators(sourcePath + "/config.tests/" + projectPath),
extraOptions);
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
int code = 0;
QString output = Environment::execute(command, &code);
//cout << output << endl;
if (code == 0) {
// compile
command = dictionary[ "MAKE" ];
if (command.contains("nmake"))
command += " /NOLOGO";
command += " -s 2>&1";
output = Environment::execute(command, &code);
//cout << output << endl;
// clean up
Environment::execute(command + " distclean 2>&1");
}
QDir::setCurrent(oldpwd);
return code == 0;
}
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
void Configure::generateQConfigPri()
{
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
// Generate qconfig.pri
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QFile configFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qconfig.pri");
if (configFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
QTextStream configStream(&configFile);
Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2010-11-11 15:35:09 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
configStream << "CONFIG+= ";
configStream << dictionary[ "BUILD" ];
if (dictionary[ "SHARED" ] == "yes")
configStream << " shared";
else
configStream << " static";
if (dictionary[ "LTCG" ] == "yes")
configStream << " ltcg";
if (dictionary[ "RTTI" ] == "yes")
configStream << " rtti";
if (dictionary["INCREDIBUILD_XGE"] == "yes")
configStream << " incredibuild_xge";
if (dictionary["PLUGIN_MANIFESTS"] == "no")
configStream << " no_plugin_manifest";
Add cross_compile to qconfig.pri for global advertising .qmake.cache is not necessarily accessible to other modules which depend on information about whether we are cross compiling or not. We might as well advertise this fact globally via the CONFIG variable in qconfig.pri. Change-Id: I6dee3e6604e5ca1c775c5f9f834fe29b4e27adb8 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
2012-02-29 23:55:13 +00:00
if (dictionary["CROSS_COMPILE"] == "yes")
configStream << " cross_compile";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["DIRECTWRITE"] == "yes")
configStream << "directwrite";
Remove qpa option form configure.exe Change-Id: Ib35b65be43f76ac4babf6e7dd3b0763274f0ab8c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-28 17:20:09 +00:00
// ### For compatibility only, should be removed later.
configStream << " qpa";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
configStream << endl;
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
configStream << "QT_ARCH = " << dictionary["QT_ARCH"] << endl;
configStream << "QT_HOST_ARCH = " << dictionary["QT_HOST_ARCH"] << endl;
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
configStream << "QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl;
configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
else
configStream << "QT_EDITION = " << dictionary["EDITION"] << endl;
configStream << "QT_CONFIG += " << qtConfig.join(" ") << endl;
configStream << "#versioning " << endl
<< "QT_VERSION = " << dictionary["VERSION"] << endl
<< "QT_MAJOR_VERSION = " << dictionary["VERSION_MAJOR"] << endl
<< "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl
<< "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl;
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
if (!dictionary["CFG_SYSROOT"].isEmpty()) {
QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ];
configStream << endl
<< "# sysroot" << endl
<< targetSpec << " {" << endl
<< " QMAKE_CFLAGS += --sysroot=$$[QT_SYSROOT]" << endl
<< " QMAKE_CXXFLAGS += --sysroot=$$[QT_SYSROOT]" << endl
<< " QMAKE_LFLAGS += --sysroot=$$[QT_SYSROOT]" << endl
<< "}" << endl;
}
configure.exe: move a few things from qmodule.pri to qconfig.pri QMAKE_RPATHDIR, QT_LIBINFIX and QT_NAMESPACE were previously set in qmodule.pri on Windows, and qconfig.pri on platforms other than Windows. Make the behavior consistent, move them to qconfig.pri. qconfig.pri is the correct file because these variables need to be visible for _all_ users of Qt, and not only the other Qt modules (the ones who load qmodule.pri). Change-Id: I4d517488a80b134a78ebde8d3196bdab3c3ab991 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-10 00:29:24 +00:00
if (!dictionary["QMAKE_RPATHDIR"].isEmpty())
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
configStream << "QMAKE_RPATHDIR += " << formatPath(dictionary["QMAKE_RPATHDIR"]) << endl;
configure.exe: move a few things from qmodule.pri to qconfig.pri QMAKE_RPATHDIR, QT_LIBINFIX and QT_NAMESPACE were previously set in qmodule.pri on Windows, and qconfig.pri on platforms other than Windows. Make the behavior consistent, move them to qconfig.pri. qconfig.pri is the correct file because these variables need to be visible for _all_ users of Qt, and not only the other Qt modules (the ones who load qmodule.pri). Change-Id: I4d517488a80b134a78ebde8d3196bdab3c3ab991 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-10 00:29:24 +00:00
if (!dictionary["QT_LIBINFIX"].isEmpty())
configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
if (!dictionary["QT_NAMESPACE"].isEmpty())
configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl;
Windows: Add ANGLE support. - Add QWindowsEGLContext usable for ANGLE and Windows CE. - Add QWindowsEGLStaticContext containing the display for resource cleanup. - Add EGLSurface to QWindowsWindow. - Add a -angle option specifying the path to the external ANGLE installation to configure, add libraries to the mkspecs. Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com> Task-number: QTBUG-24207 Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-05-23 13:07:06 +00:00
if (dictionary.value(QStringLiteral("OPENGL_ES_2")) == QStringLiteral("yes")) {
const QString angleDir = dictionary.value(QStringLiteral("ANGLE_DIR"));
if (!angleDir.isEmpty()) {
configStream
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
<< "QMAKE_INCDIR_OPENGL_ES2 = " << angleDir << "/include\n"
<< "QMAKE_LIBDIR_OPENGL_ES2_DEBUG = " << angleDir << "/lib/Debug\n"
<< "QMAKE_LIBDIR_OPENGL_ES2_RELEASE = " << angleDir << "/lib/Release\n";
Windows: Add ANGLE support. - Add QWindowsEGLContext usable for ANGLE and Windows CE. - Add QWindowsEGLStaticContext containing the display for resource cleanup. - Add EGLSurface to QWindowsWindow. - Add a -angle option specifying the path to the external ANGLE installation to configure, add libraries to the mkspecs. Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com> Task-number: QTBUG-24207 Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-05-23 13:07:06 +00:00
}
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
configStream.flush();
configFile.close();
}
}
#endif
QString Configure::addDefine(QString def)
{
QString result, defNeg, defD = def;
defD.replace(QRegExp("=.*"), "");
def.replace(QRegExp("="), " ");
if (def.startsWith("QT_NO_")) {
defNeg = defD;
defNeg.replace("QT_NO_", "QT_");
} else if (def.startsWith("QT_")) {
defNeg = defD;
defNeg.replace("QT_", "QT_NO_");
}
if (defNeg.isEmpty()) {
result = "#ifndef $DEFD\n"
"# define $DEF\n"
"#endif\n\n";
} else {
result = "#if defined($DEFD) && defined($DEFNEG)\n"
"# undef $DEFD\n"
"#elif !defined($DEFD)\n"
"# define $DEF\n"
"#endif\n\n";
}
result.replace("$DEFNEG", defNeg);
result.replace("$DEFD", defD);
result.replace("$DEF", def);
return result;
}
#if !defined(EVAL)
factor out code to install default mkspec Change-Id: I15f371df7bc24cd85c1c0924d1929da4dc3db16d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-24 19:32:08 +00:00
bool Configure::copySpec(const char *name, const char *pfx, const QString &spec)
{
// Copy configured mkspec to default directory, but remove the old one first, if there is any
QString defSpec = buildPath + "/mkspecs/" + name;
QFileInfo defSpecInfo(defSpec);
if (defSpecInfo.exists()) {
if (!Environment::rmdir(defSpec)) {
cout << "Couldn't update default " << pfx << "mkspec! Are files in " << qPrintable(defSpec) << " read-only?" << endl;
dictionary["DONE"] = "error";
return false;
}
}
QString pltSpec = sourcePath + "/mkspecs/" + spec;
QString includeSpec = buildPath + "/mkspecs/" + spec;
if (!Environment::cpdir(pltSpec, defSpec, includeSpec)) {
cout << "Couldn't update default " << pfx << "mkspec! Does " << qPrintable(pltSpec) << " exist?" << endl;
dictionary["DONE"] = "error";
return false;
}
return true;
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
void Configure::generateConfigfiles()
{
QDir(buildPath).mkpath("src/corelib/global");
QString outName(buildPath + "/src/corelib/global/qconfig.h");
QTemporaryFile tmpFile;
QTextStream tmpStream;
if (tmpFile.open()) {
tmpStream.setDevice(&tmpFile);
if (dictionary[ "QCONFIG" ] == "full") {
tmpStream << "/* Everything */" << endl;
} else {
QString configName("qconfig-" + dictionary[ "QCONFIG" ] + ".h");
tmpStream << "/* Copied from " << configName << "*/" << endl;
tmpStream << "#ifndef QT_BOOTSTRAPPED" << endl;
QFile inFile(sourcePath + "/src/corelib/global/" + configName);
if (inFile.open(QFile::ReadOnly)) {
QByteArray buffer = inFile.readAll();
tmpFile.write(buffer.constData(), buffer.size());
inFile.close();
}
tmpStream << "#endif // QT_BOOTSTRAPPED" << endl;
}
tmpStream << endl;
if (dictionary[ "SHARED" ] == "yes") {
tmpStream << "#ifndef QT_DLL" << endl;
tmpStream << "#define QT_DLL" << endl;
tmpStream << "#endif" << endl;
}
tmpStream << endl;
tmpStream << "/* License information */" << endl;
tmpStream << "#define QT_PRODUCT_LICENSEE \"" << licenseInfo[ "LICENSEE" ] << "\"" << endl;
tmpStream << "#define QT_PRODUCT_LICENSE \"" << dictionary[ "EDITION" ] << "\"" << endl;
tmpStream << endl;
tmpStream << "// Qt Edition" << endl;
tmpStream << "#ifndef QT_EDITION" << endl;
tmpStream << "# define QT_EDITION " << dictionary["QT_EDITION"] << endl;
tmpStream << "#endif" << endl;
tmpStream << endl;
if (dictionary["BUILDDEV"] == "yes") {
dictionary["QMAKE_INTERNAL"] = "yes";
tmpStream << "/* Used for example to export symbols for the certain autotests*/" << endl;
tmpStream << "#define QT_BUILD_INTERNAL" << endl;
tmpStream << endl;
}
Remove qpa option form configure.exe Change-Id: Ib35b65be43f76ac4babf6e7dd3b0763274f0ab8c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-28 17:20:09 +00:00
// ### For compatibility only, should be removed later.
tmpStream << endl << "#define Q_WS_QPA" << endl;
Add -qpa option on Windows Done-by: owolff Done-by: Friedemann Kleint
2011-05-23 14:19:56 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
tmpStream << endl << "// Compile time features" << endl;
QStringList qconfigList;
if (dictionary["STYLE_WINDOWS"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWS";
if (dictionary["STYLE_PLASTIQUE"] != "yes") qconfigList += "QT_NO_STYLE_PLASTIQUE";
if (dictionary["STYLE_CLEANLOOKS"] != "yes") qconfigList += "QT_NO_STYLE_CLEANLOOKS";
if (dictionary["STYLE_WINDOWSXP"] != "yes" && dictionary["STYLE_WINDOWSVISTA"] != "yes")
qconfigList += "QT_NO_STYLE_WINDOWSXP";
if (dictionary["STYLE_WINDOWSVISTA"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWSVISTA";
if (dictionary["STYLE_MOTIF"] != "yes") qconfigList += "QT_NO_STYLE_MOTIF";
if (dictionary["STYLE_CDE"] != "yes") qconfigList += "QT_NO_STYLE_CDE";
remove symbian support from configure Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-07 09:16:21 +00:00
// ### We still need the QT_NO_STYLE_S60 define for compiling Qt. Remove later!
qconfigList += "QT_NO_STYLE_S60";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["STYLE_WINDOWSCE"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWSCE";
if (dictionary["STYLE_WINDOWSMOBILE"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWSMOBILE";
if (dictionary["STYLE_GTK"] != "yes") qconfigList += "QT_NO_STYLE_GTK";
if (dictionary["GIF"] == "yes") qconfigList += "QT_BUILTIN_GIF_READER=1";
if (dictionary["PNG"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_PNG";
if (dictionary["JPEG"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_JPEG";
if (dictionary["ZLIB"] == "no") {
qconfigList += "QT_NO_ZLIB";
qconfigList += "QT_NO_COMPRESS";
}
if (dictionary["ACCESSIBILITY"] == "no") qconfigList += "QT_NO_ACCESSIBILITY";
Add Qt Widgets opt out support to build system There should be a clear QWidget free path for people with no interest in legacy QWidget functionality. Adding this option to configure makes this path readily accessible and hence testable. Change-Id: If87c1063fcf4c46f5280836126c11999feaa9f8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-07 00:11:44 +00:00
if (dictionary["WIDGETS"] == "no") qconfigList += "QT_NO_WIDGETS";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["OPENGL"] == "no") qconfigList += "QT_NO_OPENGL";
if (dictionary["OPENVG"] == "no") qconfigList += "QT_NO_OPENVG";
Add a new QT_NO_SSL feature macro. At the moment users of Qt must detect if it was compiled with SSL support by testing for QT_NO_OPENSSL. This means that any code that is conditionally compiled this way is tied to the presence of the openssl backend. This commit makes it possible to implement new SSL backends during the Qt5 lifetime without breaking this code. People can still test for QT_NO_OPENSSL if they really need openssl, but if they simply want to know if there's SSL support at all they should use this define instead. In addition, this commit changes the public API headers to use the new define. Change-Id: Ib57a71aa65836ac9351f120a487bfeb8009d9515 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
2012-01-03 14:08:03 +00:00
if (dictionary["OPENSSL"] == "no") {
qconfigList += "QT_NO_OPENSSL";
qconfigList += "QT_NO_SSL";
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL";
if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS";
Rename the 'declarative debug support' to 'qml debug support' Since the library and almost everything got renamed to qml, we should do so for the debugging support, too. (CONFIG+=declarative_debug will continue to work for some time being, but prints a deprecated warning). Change-Id: I295155dce873e2585c1452d2bf0625ea6ce219c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-30 11:43:10 +00:00
if (dictionary["QML_DEBUG"] == "no") qconfigList += "QT_QML_NO_DEBUGGER";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE";
if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES";
if (dictionary["OPENGL_ES_CM"] == "yes" ||
dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES";
if (dictionary["OPENGL_ES_CM"] == "yes") qconfigList += "QT_OPENGL_ES_1";
if (dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES_2";
if (dictionary["SQL_MYSQL"] == "yes") qconfigList += "QT_SQL_MYSQL";
if (dictionary["SQL_ODBC"] == "yes") qconfigList += "QT_SQL_ODBC";
if (dictionary["SQL_OCI"] == "yes") qconfigList += "QT_SQL_OCI";
if (dictionary["SQL_PSQL"] == "yes") qconfigList += "QT_SQL_PSQL";
if (dictionary["SQL_TDS"] == "yes") qconfigList += "QT_SQL_TDS";
if (dictionary["SQL_DB2"] == "yes") qconfigList += "QT_SQL_DB2";
if (dictionary["SQL_SQLITE"] == "yes") qconfigList += "QT_SQL_SQLITE";
if (dictionary["SQL_SQLITE2"] == "yes") qconfigList += "QT_SQL_SQLITE2";
if (dictionary["SQL_IBASE"] == "yes") qconfigList += "QT_SQL_IBASE";
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
if (dictionary["POSIX_IPC"] == "yes") qconfigList += "QT_POSIX_IPC";
if (dictionary["FONT_CONFIG"] == "no") qconfigList += "QT_NO_FONTCONFIG";
if (dictionary["NIS"] == "yes")
qconfigList += "QT_NIS";
else
qconfigList += "QT_NO_NIS";
if (dictionary["LARGE_FILE"] == "yes")
tmpStream << "#define QT_LARGEFILE_SUPPORT 64" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qconfigList.sort();
for (int i = 0; i < qconfigList.count(); ++i)
tmpStream << addDefine(qconfigList.at(i));
if (dictionary["EMBEDDED"] == "yes")
{
// Check for keyboard, mouse, gfx.
QStringList kbdDrivers = dictionary["KBD_DRIVERS"].split(" ");;
QStringList allKbdDrivers;
allKbdDrivers<<"tty"<<"usb"<<"sl5000"<<"yopy"<<"vr41xx"<<"qvfb"<<"um";
foreach (const QString &kbd, allKbdDrivers) {
if (!kbdDrivers.contains(kbd))
tmpStream<<"#define QT_NO_QWS_KBD_"<<kbd.toUpper()<<endl;
}
QStringList mouseDrivers = dictionary["MOUSE_DRIVERS"].split(" ");
QStringList allMouseDrivers;
allMouseDrivers << "pc"<<"bus"<<"linuxtp"<<"yopy"<<"vr41xx"<<"tslib"<<"qvfb";
foreach (const QString &mouse, allMouseDrivers) {
if (!mouseDrivers.contains(mouse))
tmpStream<<"#define QT_NO_QWS_MOUSE_"<<mouse.toUpper()<<endl;
}
QStringList gfxDrivers = dictionary["GFX_DRIVERS"].split(" ");
QStringList allGfxDrivers;
Remove unmaintained and broken VNC platform plugin Change-Id: Ie0a07c3a6822870b095a20d997b63fb1635f20be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Robert Griebl <robert.griebl@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-03-06 11:23:31 +00:00
allGfxDrivers<<"linuxfb"<<"transformed"<<"qvfb"<<"multiscreen"<<"ahi";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
foreach (const QString &gfx, allGfxDrivers) {
if (!gfxDrivers.contains(gfx))
tmpStream<<"#define QT_NO_QWS_"<<gfx.toUpper()<<endl;
}
tmpStream<<"#define Q_WS_QWS"<<endl;
QStringList depths = dictionary[ "QT_QWS_DEPTH" ].split(" ");
foreach (const QString &depth, depths)
tmpStream<<"#define QT_QWS_DEPTH_"+depth<<endl;
}
Revert "QtPrintSupport: Remove remaining LPR specific code" This doesn't compile with a typical cross-compilation setup, which generally won't include cups headers. The commit should have been rejected, but wasn't, due to a bug in the Qt Project CI. Since it now causes all other modules depending on qtbase to fail their CI, it must be reverted to minimize disruption while the commit can be amended and/or the test toolchain updated to include cups headers. This reverts commit 80f7a388906f94f58bf765a32b9abbb16f967db2. Change-Id: I315ae275b37de358a74af28ab7bd691c9849acba Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-08 02:56:45 +00:00
if (dictionary[ "QT_CUPS" ] == "no")
tmpStream<<"#define QT_NO_CUPS"<<endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary[ "QT_ICONV" ] == "no")
tmpStream<<"#define QT_NO_ICONV"<<endl;
if (dictionary[ "QT_GLIB" ] == "no")
tmpStream<<"#define QT_NO_GLIB"<<endl;
if (dictionary[ "QT_INOTIFY" ] == "no")
tmpStream<<"#define QT_NO_INOTIFY"<<endl;
if (dictionary[ "QT_SXE" ] == "no")
tmpStream<<"#define QT_NO_SXE"<<endl;
Support other platform names on configure.exe Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX and Blackberry. Default is "Windows". Change-Id: Ifa4d1b9c02cda956be9becdf8db195d3d494f1d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-08 13:20:35 +00:00
tmpStream<<"#define QT_QPA_DEFAULT_PLATFORM_NAME \"" << qpaPlatformName() << "\""<<endl;
Fix detection of default platform plugin. Let configure generate the QT_QPA_DEFAULT_PLATFORM_NAME in qconfig.h. This allows us to override the platform name using a configure argument. This commit adds -qpa <platform> that lets the user specify the default platform at configure time. Note that the default platform is not checked against the tree since plugins are allowed to exist outside the Qt source tree. In the absence of -qpa argument, configure checks the mkspec for a variable named QT_QPA_DEFAULT_PLATFORM. This check is implemented only in the unix configure because it will be primarily used in custom mkspecs (devices, boards). If -qpa argument is absent and the mkspec variable is absent, the default value is determined based on the OS as below: Unix - "xcb" Windows - "windows" Mac - "cocoa" QNX - "qnx" Done-with: Jørgen Lind Change-Id: I0df31811a1b901a3242bfada1232e596ebda04f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2012-04-18 22:57:00 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
tmpStream.flush();
tmpFile.flush();
// Replace old qconfig.h with new one
::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL);
QFile::remove(outName);
tmpFile.copy(outName);
tmpFile.close();
}
QString spec = dictionary.contains("XQMAKESPEC") ? dictionary["XQMAKESPEC"] : dictionary["QMAKESPEC"];
introduce ability to build projects for the host system when qmake runs into the new option(host_build) command, it will restart the project evaluation with a host spec. the new default host spec is called default-host (gasp!). it is overridden with the pre-exising -spec / -platform option, while the new -xspec / -xplatform option overrides the pre-existing default spec. specifying -spec but not -xspec will set the xspec, too, so the behavior is backwards-compatible. same for the XQMAKESPEC override read from .qmake.cache and the environment variable. the cleaner solution would be adding -hostspec, to be symmetrical with the override semantics, but that would deviate from configure in turn. Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-31 17:36:18 +00:00
if (!copySpec("default", "", spec)
|| !copySpec("default-host", "host ", dictionary["QMAKESPEC"]))
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
return;
// Generate the new qconfig.cpp file
QDir(buildPath).mkpath("src/corelib/global");
outName = buildPath + "/src/corelib/global/qconfig.cpp";
QTemporaryFile tmpFile2;
if (tmpFile2.open()) {
tmpStream.setDevice(&tmpFile2);
tmpStream << "/* Licensed */" << endl
<< "static const char qt_configure_licensee_str [512 + 12] = \"qt_lcnsuser=" << licenseInfo["LICENSEE"] << "\";" << endl
<< "static const char qt_configure_licensed_products_str [512 + 12] = \"qt_lcnsprod=" << dictionary["EDITION"] << "\";" << endl
<< endl
<< "/* Build date */" << endl
<< "static const char qt_configure_installation [11 + 12] = \"qt_instdate=" << QDate::currentDate().toString(Qt::ISODate) << "\";" << endl
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
<< endl
<< "static const char qt_configure_prefix_path_strs[][12 + 512] = {" << endl
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
<< " \"qt_prfxpath=" << formatPath(dictionary["QT_INSTALL_PREFIX"]) << "\"," << endl
<< " \"qt_docspath=" << formatPath(dictionary["QT_INSTALL_DOCS"]) << "\"," << endl
<< " \"qt_hdrspath=" << formatPath(dictionary["QT_INSTALL_HEADERS"]) << "\"," << endl
<< " \"qt_libspath=" << formatPath(dictionary["QT_INSTALL_LIBS"]) << "\"," << endl
<< " \"qt_binspath=" << formatPath(dictionary["QT_INSTALL_BINS"]) << "\"," << endl
<< " \"qt_plugpath=" << formatPath(dictionary["QT_INSTALL_PLUGINS"]) << "\"," << endl
<< " \"qt_impspath=" << formatPath(dictionary["QT_INSTALL_IMPORTS"]) << "\"," << endl
<< " \"qt_datapath=" << formatPath(dictionary["QT_INSTALL_DATA"]) << "\"," << endl
<< " \"qt_trnspath=" << formatPath(dictionary["QT_INSTALL_TRANSLATIONS"]) << "\"," << endl
<< " \"qt_xmplpath=" << formatPath(dictionary["QT_INSTALL_EXAMPLES"]) << "\"," << endl
<< " \"qt_tstspath=" << formatPath(dictionary["QT_INSTALL_TESTS"]) << "\"," << endl
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
<< "#ifdef QT_BUILD_QMAKE" << endl
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
<< " \"qt_ssrtpath=" << formatPath(dictionary["CFG_SYSROOT"]) << "\"," << endl
<< " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl
<< " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
<< " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
<< "#endif" << endl
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
<< "};" << endl;
if ((platform() != WINDOWS) && (platform() != WINDOWS_CE))
tmpStream << "static const char qt_configure_settings_path_str [256 + 12] = \"qt_stngpath=" << formatPath(dictionary["QT_INSTALL_SETTINGS"]) << "\";" << endl;
tmpStream << endl
revamp -sysroot and -hostprefix handling instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-02-28 19:57:38 +00:00
<< "/* strlen( \"qt_lcnsxxxx\") == 12 */" << endl
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
<< "#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12;" << endl
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
<< "#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12;" << endl;
if ((platform() != WINDOWS) && (platform() != WINDOWS_CE))
tmpStream << "#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;" << endl;
tmpStream << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
tmpStream.flush();
tmpFile2.flush();
// Replace old qconfig.cpp with new one
::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL);
QFile::remove(outName);
tmpFile2.copy(outName);
tmpFile2.close();
}
QTemporaryFile tmpFile3;
if (tmpFile3.open()) {
tmpStream.setDevice(&tmpFile3);
tmpStream << "/* Evaluation license key */" << endl
<< "static const volatile char qt_eval_key_data [512 + 12] = \"qt_qevalkey=" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl;
tmpStream.flush();
tmpFile3.flush();
outName = buildPath + "/src/corelib/global/qconfig_eval.cpp";
::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL);
QFile::remove(outName);
if (dictionary["EDITION"] == "Evaluation" || qmakeDefines.contains("QT_EVAL"))
tmpFile3.copy(outName);
tmpFile3.close();
}
}
#endif
#if !defined(EVAL)
void Configure::displayConfig()
{
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
fstream sout;
sout.open(QString(buildPath + "/config.summary").toLocal8Bit().constData(),
ios::in | ios::out | ios::trunc);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// Give some feedback
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Environment:" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QString env = QString::fromLocal8Bit(getenv("INCLUDE")).replace(QRegExp("[;,]"), "\r\n ");
if (env.isEmpty())
env = "Unset";
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << " INCLUDE=\r\n " << env << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
env = QString::fromLocal8Bit(getenv("LIB")).replace(QRegExp("[;,]"), "\r\n ");
if (env.isEmpty())
env = "Unset";
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << " LIB=\r\n " << env << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
env = QString::fromLocal8Bit(getenv("PATH")).replace(QRegExp("[;,]"), "\r\n ");
if (env.isEmpty())
env = "Unset";
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << " PATH=\r\n " << env << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Windows-configure.exe: Do not print licensing info in log. The hash value is not correct after choosing a different license. Also, Unix configure does not report it. Change-Id: I988fffc923c3894e8141a91fc50747e30e20966b Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-05-21 11:50:41 +00:00
if (dictionary[QStringLiteral("EDITION")] != QStringLiteral("OpenSource")) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QString l1 = licenseInfo[ "LICENSEE" ];
QString l2 = licenseInfo[ "LICENSEID" ];
QString l3 = dictionary["EDITION"] + ' ' + "Edition";
QString l4 = licenseInfo[ "EXPIRYDATE" ];
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Licensee...................." << (l1.isNull() ? "" : l1) << endl;
sout << "License ID.................." << (l2.isNull() ? "" : l2) << endl;
sout << "Product license............." << (l3.isNull() ? "" : l3) << endl;
sout << "Expiry Date................." << (l4.isNull() ? "" : l4) << endl << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Configuration:" << endl;
sout << " " << qmakeConfig.join("\r\n ") << endl;
sout << "Qt Configuration:" << endl;
sout << " " << qtConfig.join("\r\n ") << endl;
sout << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary.contains("XQMAKESPEC"))
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "QMAKESPEC..................." << dictionary[ "XQMAKESPEC" ] << " (" << dictionary["QMAKESPEC_FROM"] << ")" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
else
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "QMAKESPEC..................." << dictionary[ "QMAKESPEC" ] << " (" << dictionary["QMAKESPEC_FROM"] << ")" << endl;
Record the sub-architecture (CPU features enabled in the compiler) If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-31 22:40:49 +00:00
sout << "Architecture................" << dictionary["QT_ARCH"]
<< ", features:" << dictionary["QT_CPU_FEATURES"] << endl;
sout << "Host Architecture..........." << dictionary["QT_HOST_ARCH"]
<< ", features:" << dictionary["QT_HOST_CPU_FEATURES"] << endl;
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Maketool...................." << dictionary[ "MAKE" ] << endl;
sout << "Debug symbols..............." << (dictionary[ "BUILD" ] == "debug" ? "yes" : "no") << endl;
sout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl;
sout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl;
sout << "RTTI support................" << dictionary[ "RTTI" ] << endl;
sout << "SSE2 support................" << dictionary[ "SSE2" ] << endl;
Add configure-time checking for the SSE and AVX features on Windows Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-12-30 00:44:16 +00:00
sout << "SSE3 support................" << dictionary[ "SSE3" ] << endl;
sout << "SSSE3 support..............." << dictionary[ "SSSE3" ] << endl;
sout << "SSE4.1 support.............." << dictionary[ "SSE4_1" ] << endl;
sout << "SSE4.2 support.............." << dictionary[ "SSE4_2" ] << endl;
sout << "AVX support................." << dictionary[ "AVX" ] << endl;
sout << "AVX2 support................" << dictionary[ "AVX2" ] << endl;
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
sout << "NEON support................" << dictionary[ "NEON" ] << endl;
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "IWMMXT support.............." << dictionary[ "IWMMXT" ] << endl;
sout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
New command line switches for configure.exe Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-20 14:00:34 +00:00
sout << "Large File support.........." << dictionary[ "LARGE_FILE" ] << endl;
sout << "NIS support................." << dictionary[ "NIS" ] << endl;
sout << "Iconv support..............." << dictionary[ "QT_ICONV" ] << endl;
sout << "Glib support................" << dictionary[ "QT_GLIB" ] << endl;
Windows: Add ANGLE support. - Add QWindowsEGLContext usable for ANGLE and Windows CE. - Add QWindowsEGLStaticContext containing the display for resource cleanup. - Add EGLSurface to QWindowsWindow. - Add a -angle option specifying the path to the external ANGLE installation to configure, add libraries to the mkspecs. Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com> Task-number: QTBUG-24207 Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-05-23 13:07:06 +00:00
if (dictionary.value(QStringLiteral("OPENGL_ES_2")) == QStringLiteral("yes")) {
const QString angleDir = dictionary.value(QStringLiteral("ANGLE_DIR"));
if (!angleDir.isEmpty())
sout << "ANGLE......................." << QDir::toNativeSeparators(angleDir) << endl;
}
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl;
sout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl;
sout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl;
sout << "QtWidgets module support...." << dictionary[ "WIDGETS" ] << endl;
sout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl;
sout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl;
sout << "Third Party Libraries:" << endl;
sout << " ZLIB support............" << dictionary[ "ZLIB" ] << endl;
sout << " GIF support............." << dictionary[ "GIF" ] << endl;
sout << " JPEG support............" << dictionary[ "JPEG" ] << endl;
sout << " PNG support............." << dictionary[ "PNG" ] << endl;
sout << " FreeType support........" << dictionary[ "FREETYPE" ] << endl << endl;
sout << " PCRE support............" << dictionary[ "PCRE" ] << endl;
sout << " ICU support............." << dictionary[ "ICU" ] << endl;
sout << "Styles:" << endl;
sout << " Windows................." << dictionary[ "STYLE_WINDOWS" ] << endl;
sout << " Windows XP.............." << dictionary[ "STYLE_WINDOWSXP" ] << endl;
sout << " Windows Vista..........." << dictionary[ "STYLE_WINDOWSVISTA" ] << endl;
sout << " Plastique..............." << dictionary[ "STYLE_PLASTIQUE" ] << endl;
sout << " Cleanlooks.............." << dictionary[ "STYLE_CLEANLOOKS" ] << endl;
sout << " Motif..................." << dictionary[ "STYLE_MOTIF" ] << endl;
sout << " CDE....................." << dictionary[ "STYLE_CDE" ] << endl;
sout << " Windows CE.............." << dictionary[ "STYLE_WINDOWSCE" ] << endl;
sout << " Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl << endl;
sout << "Sql Drivers:" << endl;
sout << " ODBC...................." << dictionary[ "SQL_ODBC" ] << endl;
sout << " MySQL..................." << dictionary[ "SQL_MYSQL" ] << endl;
sout << " OCI....................." << dictionary[ "SQL_OCI" ] << endl;
sout << " PostgreSQL.............." << dictionary[ "SQL_PSQL" ] << endl;
sout << " TDS....................." << dictionary[ "SQL_TDS" ] << endl;
sout << " DB2....................." << dictionary[ "SQL_DB2" ] << endl;
sout << " SQLite.................." << dictionary[ "SQL_SQLITE" ] << " (" << dictionary[ "SQL_SQLITE_LIB" ] << ")" << endl;
sout << " SQLite2................." << dictionary[ "SQL_SQLITE2" ] << endl;
sout << " InterBase..............." << dictionary[ "SQL_IBASE" ] << endl << endl;
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
sout << "Sources are in.............." << QDir::toNativeSeparators(dictionary["QT_SOURCE_TREE"]) << endl;
sout << "Build is done in............" << QDir::toNativeSeparators(dictionary["QT_BUILD_TREE"]) << endl;
sout << "Install prefix.............." << QDir::toNativeSeparators(dictionary["QT_INSTALL_PREFIX"]) << endl;
sout << "Headers installed to........" << QDir::toNativeSeparators(dictionary["QT_INSTALL_HEADERS"]) << endl;
sout << "Libraries installed to......" << QDir::toNativeSeparators(dictionary["QT_INSTALL_LIBS"]) << endl;
sout << "Plugins installed to........" << QDir::toNativeSeparators(dictionary["QT_INSTALL_PLUGINS"]) << endl;
sout << "Imports installed to........" << QDir::toNativeSeparators(dictionary["QT_INSTALL_IMPORTS"]) << endl;
sout << "Binaries installed to......." << QDir::toNativeSeparators(dictionary["QT_INSTALL_BINS"]) << endl;
sout << "Docs installed to..........." << QDir::toNativeSeparators(dictionary["QT_INSTALL_DOCS"]) << endl;
sout << "Data installed to..........." << QDir::toNativeSeparators(dictionary["QT_INSTALL_DATA"]) << endl;
sout << "Translations installed to..." << QDir::toNativeSeparators(dictionary["QT_INSTALL_TRANSLATIONS"]) << endl;
sout << "Examples installed to......." << QDir::toNativeSeparators(dictionary["QT_INSTALL_EXAMPLES"]) << endl;
sout << "Tests installed to.........." << QDir::toNativeSeparators(dictionary["QT_INSTALL_TESTS"]) << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith(QLatin1String("wince"))) {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Using c runtime detection..." << dictionary[ "CE_CRT" ] << endl;
sout << "Cetest support.............." << dictionary[ "CETEST" ] << endl;
sout << "Signature..................." << dictionary[ "CE_SIGNATURE"] << endl << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
if (checkAvailability("INCREDIBUILD_XGE"))
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Using IncrediBuild XGE......" << dictionary["INCREDIBUILD_XGE"] << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (!qmakeDefines.isEmpty()) {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Defines.....................";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
for (QStringList::Iterator defs = qmakeDefines.begin(); defs != qmakeDefines.end(); ++defs)
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << (*defs) << " ";
sout << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
if (!qmakeIncludes.isEmpty()) {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Include paths...............";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
for (QStringList::Iterator incs = qmakeIncludes.begin(); incs != qmakeIncludes.end(); ++incs)
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << (*incs) << " ";
sout << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
if (!qmakeLibs.isEmpty()) {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Additional libraries........";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
for (QStringList::Iterator libs = qmakeLibs.begin(); libs != qmakeLibs.end(); ++libs)
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << (*libs) << " ";
sout << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
if (dictionary[ "QMAKE_INTERNAL" ] == "yes") {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "Using internal configuration." << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
if (dictionary[ "SHARED" ] == "no") {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "WARNING: Using static linking will disable the use of plugins." << endl;
sout << " Make sure you compile ALL needed modules into the library." << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
if (dictionary[ "OPENSSL" ] == "linked" && opensslLibs.isEmpty()) {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "NOTE: When linking against OpenSSL, you can override the default" << endl;
sout << "library names through OPENSSL_LIBS." << endl;
sout << "For example:" << endl;
sout << " configure -openssl-linked OPENSSL_LIBS=\"-lssleay32 -llibeay32\"" << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
if (dictionary[ "ZLIB_FORCED" ] == "yes") {
QString which_zlib = "supplied";
if (dictionary[ "ZLIB" ] == "system")
which_zlib = "system";
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << "NOTE: The -no-zlib option was supplied but is no longer supported." << endl
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
<< endl
<< "Qt now requires zlib support in all builds, so the -no-zlib" << endl
<< "option was ignored. Qt will be built using the " << which_zlib
<< "zlib" << endl;
}
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
if (dictionary["OBSOLETE_ARCH_ARG"] == "yes") {
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
sout << endl
Remove -arch argument and #define QT_ARCH from configures Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-14 09:01:17 +00:00
<< "NOTE: The -arch option is obsolete." << endl
<< endl
<< "Qt now detects the target and host architectures based on compiler" << endl
<< "output. Qt will be built using " << dictionary["QT_ARCH"] << " for the target architecture" << endl
<< "and " << dictionary["QT_HOST_ARCH"] << " for the host architecture (note that these two" << endl
<< "will be the same unless you are cross-compiling)." << endl
<< endl;
}
Save configuration feedback into config.summary commit d60d98450ada232fc3e8d0c5762a2b7a90beb921 adds the support for unix configure. This commit adds the same for Windows configure. Change-Id: Ibcc604154fd7d0d9c6112ae5459d9bb842daf180 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-18 05:23:50 +00:00
// display config.summary
sout.seekg(0, ios::beg);
while (sout) {
string str;
getline(sout, str);
cout << str << endl;
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
#endif
#if !defined(EVAL)
void Configure::generateHeaders()
{
Perl check for windows configure. Works for Windows, *nix check is done by bash shell. Task-number: QTBUG-5710 Merge-request: 1362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit b3de52be29a54aa23a446c7689a48f73206a7cbc) Change-Id: I6c0ee22e354724c08fb4070b370254223fd5a431 Reviewed-on: http://codereview.qt-project.org/4590 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-07 18:08:34 +00:00
if (dictionary["SYNCQT"] == "yes") {
if (findFile("perl.exe")) {
cout << "Running syncqt..." << endl;
QStringList args;
args += buildPath + "/bin/syncqt.bat";
Change syncqt default parameters for shadow building For shadow builds configure creates syncqt script to shadow build directory tree calling the original syncqt from qtbase source tree. This wrapped script will add two default parameters when calling the original script. Both parameters are overridden in qtbase/mkspecs/features/default_pre.prf and are not needed except by configure script itself in latter stages where the parameter should be applied explicitly in shadow build condition branch. In addition, it adds the qtdir parameter for the forwarded syncqt call to indicate the location of qt sources for the syncqt. This also will give correct qmake path for qtmodule-configtests script triggered from syncqt. Changes are done both for Linux and Windows configure. Change-Id: I307b2e76c203ee14b849f10ff629f9668da2f223 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-23 07:27:06 +00:00
args += sourcePath;
Perl check for windows configure. Works for Windows, *nix check is done by bash shell. Task-number: QTBUG-5710 Merge-request: 1362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit b3de52be29a54aa23a446c7689a48f73206a7cbc) Change-Id: I6c0ee22e354724c08fb4070b370254223fd5a431 Reviewed-on: http://codereview.qt-project.org/4590 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-07 18:08:34 +00:00
QStringList env;
env += QString("QTDIR=" + sourcePath);
env += QString("PATH=" + buildPath + "/bin/;" + qgetenv("PATH"));
int retc = Environment::execute(args, env, QStringList());
if (retc) {
cout << "syncqt failed, return code " << retc << endl << endl;
dictionary["DONE"] = "error";
}
} else {
cout << "Perl not found in environment - cannot run syncqt." << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary["DONE"] = "error";
}
}
}
void Configure::buildQmake()
{
if (dictionary[ "BUILD_QMAKE" ] == "yes") {
QStringList args;
// Build qmake
QString pwd = QDir::currentPath();
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
if (!QDir(buildPath).mkpath("qmake")) {
cout << "Cannot create qmake build dir." << endl;
dictionary[ "DONE" ] = "error";
return;
}
if (!QDir::setCurrent(buildPath + "/qmake")) {
cout << "Cannot enter qmake build dir." << endl;
dictionary[ "DONE" ] = "error";
return;
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QString makefile = "Makefile";
{
QFile out(makefile);
if (out.open(QFile::WriteOnly | QFile::Text)) {
QTextStream stream(&out);
stream << "#AutoGenerated by configure.exe" << endl
Remove QDir::convertSeparators() This method has been deprecated since Qt 4.2. QDir::toNativeSeparators() replaces it since then. Change-Id: I49e6e1bfd50f26aa30134e599ee82067709549a7 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
2012-01-19 09:29:41 +00:00
<< "BUILD_PATH = " << QDir::toNativeSeparators(buildPath) << endl
<< "SOURCE_PATH = " << QDir::toNativeSeparators(sourcePath) << endl;
Move private headers into versioned subdirectory This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
2011-04-20 18:57:51 +00:00
stream << "QMAKESPEC = " << dictionary["QMAKESPEC"] << endl
Use qglobal.h's VERSION number instead of hardcoded current version Done-by: Friedemann Kleint
2011-05-23 14:11:59 +00:00
<< "QT_VERSION = " << dictionary["VERSION"] << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (dictionary["EDITION"] == "OpenSource" ||
dictionary["QT_EDITION"].contains("OPENSOURCE"))
stream << "QMAKE_OPENSOURCE_EDITION = yes" << endl;
stream << "\n\n";
QFile in(sourcePath + "/qmake/" + dictionary["QMAKEMAKEFILE"]);
if (in.open(QFile::ReadOnly | QFile::Text)) {
QString d = in.readAll();
//### need replaces (like configure.sh)? --Sam
stream << d << endl;
}
stream.flush();
out.close();
}
}
args += dictionary[ "MAKE" ];
args += "-f";
args += makefile;
cout << "Creating qmake..." << endl;
int exitCode = Environment::execute(args, QStringList(), QStringList());
if (exitCode) {
args.clear();
args += dictionary[ "MAKE" ];
args += "-f";
args += makefile;
args += "clean";
exitCode = Environment::execute(args, QStringList(), QStringList());
if (exitCode) {
cout << "Cleaning qmake failed, return code " << exitCode << endl << endl;
dictionary[ "DONE" ] = "error";
} else {
args.clear();
args += dictionary[ "MAKE" ];
args += "-f";
args += makefile;
exitCode = Environment::execute(args, QStringList(), QStringList());
if (exitCode) {
cout << "Building qmake failed, return code " << exitCode << endl << endl;
dictionary[ "DONE" ] = "error";
}
}
}
QDir::setCurrent(pwd);
}
introduce /get property variants properties are now split into a write location $$[FOO] and a read location $$[FOO/get]. the write locations are hard-coded and configurable via qt.conf/Paths as before, while the read locations are configured via qt.conf/EffectivePaths. this finally provides a clean solution to the problem that during the qt build itself tools and libraries need to be taken from somewhere else than they are installed to. Change-Id: I956c43bd082afd465e690fe75d0bee3c2c0f7c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2012-05-03 13:36:03 +00:00
// Generate qt.conf
QFile confFile(buildPath + "/bin/qt.conf");
if (confFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
QTextStream confStream(&confFile);
confStream << "[EffectivePaths]" << endl
<< "Prefix=.." << endl;
confStream.flush();
confFile.close();
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
}
#endif
void Configure::findProjects(const QString& dirName)
{
if (dictionary[ "NOPROCESS" ] == "no") {
QDir dir(dirName);
QString entryName;
int makeListNumber;
ProjectType qmakeTemplate;
const QFileInfoList &list = dir.entryInfoList(QStringList(QLatin1String("*.pro")),
QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
for (int i = 0; i < list.size(); ++i) {
const QFileInfo &fi = list.at(i);
if (fi.fileName() != "qmake.pro") {
entryName = dirName + "/" + fi.fileName();
if (fi.isDir()) {
findProjects(entryName);
} else {
qmakeTemplate = projectType(fi.absoluteFilePath());
switch (qmakeTemplate) {
case Lib:
case Subdirs:
makeListNumber = 1;
break;
default:
makeListNumber = 2;
break;
}
makeList[makeListNumber].append(new MakeItem(sourceDir.relativeFilePath(fi.absolutePath()),
fi.fileName(),
"Makefile",
qmakeTemplate));
}
}
}
}
}
void Configure::appendMakeItem(int inList, const QString &item)
{
QString dir;
if (item != "src")
dir = "/" + item;
dir.prepend("/src");
makeList[inList].append(new MakeItem(sourcePath + dir,
item + ".pro", buildPath + dir + "/Makefile", Lib));
if (dictionary[ "DSPFILES" ] == "yes") {
makeList[inList].append(new MakeItem(sourcePath + dir,
item + ".pro", buildPath + dir + "/" + item + ".dsp", Lib));
}
if (dictionary[ "VCPFILES" ] == "yes") {
makeList[inList].append(new MakeItem(sourcePath + dir,
item + ".pro", buildPath + dir + "/" + item + ".vcp", Lib));
}
if (dictionary[ "VCPROJFILES" ] == "yes") {
makeList[inList].append(new MakeItem(sourcePath + dir,
item + ".pro", buildPath + dir + "/" + item + ".vcproj", Lib));
}
}
void Configure::generateMakefiles()
{
if (dictionary[ "NOPROCESS" ] == "no") {
#if !defined(EVAL)
cout << "Creating makefiles in src..." << endl;
#endif
QString spec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ];
if (spec != "win32-msvc")
dictionary[ "DSPFILES" ] = "no";
if (spec != "win32-msvc.net" && !spec.startsWith("win32-msvc2") && !spec.startsWith(QLatin1String("wince")))
dictionary[ "VCPROJFILES" ] = "no";
int i = 0;
QString pwd = QDir::currentPath();
if (dictionary["FAST"] != "yes") {
QString dirName;
bool generate = true;
bool doDsp = (dictionary["DSPFILES"] == "yes" || dictionary["VCPFILES"] == "yes"
|| dictionary["VCPROJFILES"] == "yes");
while (generate) {
QString pwd = QDir::currentPath();
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString dirPath = buildPath + dirName;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QStringList args;
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
args << buildPath + "/bin/qmake";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (doDsp) {
if (dictionary[ "DEPENDENCIES" ] == "no")
args << "-nodepend";
args << "-tp" << "vc";
doDsp = false; // DSP files will be done
printf("Generating Visual Studio project files...\n");
} else {
printf("Generating Makefiles...\n");
generate = false; // Now Makefiles will be done
}
args << "-r";
Some changes for qtbase
2010-11-09 02:09:10 +00:00
args << (sourcePath + "/qtbase.pro");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
args << "-o";
args << buildPath;
if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty())
args << dictionary[ "QMAKEADDITIONALARGS" ];
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QDir::setCurrent(dirPath);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
if (int exitCode = Environment::execute(args, QStringList(), QStringList())) {
cout << "Qmake failed, return code " << exitCode << endl << endl;
dictionary[ "DONE" ] = "error";
}
}
} else {
findProjects(sourcePath);
for (i=0; i<3; i++) {
for (int j=0; j<makeList[i].size(); ++j) {
MakeItem *it=makeList[i][j];
Make configure.exe not overwrite its own Makefile in -fast mode configure.exe's Makefile is created by configure.bat. While severely lacking, it is what gets executed when the user configures, so developers modifying configure.exe should use that too. Change-Id: Ib216889594d08c980bfae6d2dbbb27ee9901375a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-24 17:15:49 +00:00
if (it->directory == "tools/configure")
continue; // don't overwrite our own Makefile
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QString dirPath = it->directory + '/';
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QString projectName = it->proFile;
QString makefileName = buildPath + "/" + dirPath + it->target;
// For shadowbuilds, we need to create the path first
QDir buildPathDir(buildPath);
if (sourcePath != buildPath && !buildPathDir.exists(dirPath))
buildPathDir.mkpath(dirPath);
QStringList args;
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
args << QDir::toNativeSeparators(buildPath + "/bin/qmake.exe");
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
args << sourcePath + "/" + dirPath + projectName;
args << dictionary[ "QMAKE_ALL_ARGS" ];
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
cout << "For " << qPrintable(QDir::toNativeSeparators(dirPath + projectName)) << endl;
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
args << "-o";
args << it->target;
if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty())
args << dictionary[ "QMAKEADDITIONALARGS" ];
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
QDir::setCurrent(dirPath);
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
QFile file(makefileName);
Make configure.exe create files with Windows line-endings Except for the perl sources, just in case. This helps if you need to open the output files in, say, notepad.exe. Change-Id: Ibf46b74af2efd6936586650e1405750bfef17952 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-24 17:14:10 +00:00
if (!file.open(QFile::WriteOnly | QFile::Text)) {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
printf("failed on dirPath=%s, makefile=%s\n",
clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-28 14:00:06 +00:00
qPrintable(QDir::toNativeSeparators(dirPath)),
qPrintable(QDir::toNativeSeparators(makefileName)));
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
continue;
}
QTextStream txt(&file);
txt << "all:\n";
txt << "\t" << args.join(" ") << "\n";
don't overquote make command $(MAKE) is apparently already quoted when the path contains spaces Change-Id: Ie09a0f43083f9eae95fc135c3a74364eaa356934
2012-06-13 13:19:46 +00:00
txt << "\t$(MAKE) -$(MAKEFLAGS) -f " << it->target << "\n";
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
txt << "first: all\n";
txt << "qmake:\n";
txt << "\t" << args.join(" ") << "\n";
}
}
}
QDir::setCurrent(pwd);
} else {
cout << "Processing of project files have been disabled." << endl;
cout << "Only use this option if you really know what you're doing." << endl << endl;
return;
}
}
void Configure::showSummary()
{
QString make = dictionary[ "MAKE" ];
if (!dictionary.contains("XQMAKESPEC")) {
cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl;
cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
} else if (dictionary.value("QMAKESPEC").startsWith("wince")) {
// we are cross compiling for Windows CE
cout << endl << endl << "Qt is now configured for building. To start the build run:" << endl
<< "\tsetcepaths " << dictionary.value("XQMAKESPEC") << endl
<< "\t" << qPrintable(make) << endl
<< "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
}
}
Configure::ProjectType Configure::projectType(const QString& proFileName)
{
QFile proFile(proFileName);
if (proFile.open(QFile::ReadOnly)) {
QString buffer = proFile.readLine(1024);
while (!buffer.isEmpty()) {
QStringList segments = buffer.split(QRegExp("\\s"));
QStringList::Iterator it = segments.begin();
if (segments.size() >= 3) {
QString keyword = (*it++);
QString operation = (*it++);
QString value = (*it++);
if (keyword == "TEMPLATE") {
if (value == "lib")
return Lib;
else if (value == "subdirs")
return Subdirs;
}
}
// read next line
buffer = proFile.readLine(1024);
}
proFile.close();
}
// Default to app handling
return App;
}
#if !defined(EVAL)
bool Configure::showLicense(QString orgLicenseFile)
{
if (dictionary["LICENSE_CONFIRMED"] == "yes") {
cout << "You have already accepted the terms of the license." << endl << endl;
return true;
}
bool haveGpl3 = false;
QString licenseFile = orgLicenseFile;
QString theLicense;
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL3");
theLicense = "GNU Lesser General Public License (LGPL) version 2.1";
if (haveGpl3)
theLicense += "\nor the GNU General Public License (GPL) version 3";
} else {
// the first line of the license file tells us which license it is
QFile file(licenseFile);
if (!file.open(QFile::ReadOnly)) {
cout << "Failed to load LICENSE file" << endl;
return false;
}
theLicense = file.readLine().trimmed();
}
forever {
char accept = '?';
cout << "You are licensed to use this software under the terms of" << endl
<< "the " << theLicense << "." << endl
<< endl;
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
if (haveGpl3)
cout << "Type '3' to view the GNU General Public License version 3 (GPLv3)." << endl;
cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl;
} else {
cout << "Type '?' to view the " << theLicense << "." << endl;
}
cout << "Type 'y' to accept this license offer." << endl
<< "Type 'n' to decline this license offer." << endl
<< endl
<< "Do you accept the terms of the license?" << endl;
cin >> accept;
accept = tolower(accept);
if (accept == 'y') {
return true;
} else if (accept == 'n') {
return false;
} else {
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
if (accept == '3')
licenseFile = orgLicenseFile + "/LICENSE.GPL3";
else
licenseFile = orgLicenseFile + "/LICENSE.LGPL";
}
// Get console line height, to fill the screen properly
int i = 0, screenHeight = 25; // default
CONSOLE_SCREEN_BUFFER_INFO consoleInfo;
HANDLE stdOut = GetStdHandle(STD_OUTPUT_HANDLE);
if (GetConsoleScreenBufferInfo(stdOut, &consoleInfo))
screenHeight = consoleInfo.srWindow.Bottom
- consoleInfo.srWindow.Top
- 1; // Some overlap for context
// Prompt the license content to the user
QFile file(licenseFile);
if (!file.open(QFile::ReadOnly)) {
cout << "Failed to load LICENSE file" << licenseFile << endl;
return false;
}
QStringList licenseContent = QString(file.readAll()).split('\n');
while (i < licenseContent.size()) {
cout << licenseContent.at(i) << endl;
if (++i % screenHeight == 0) {
cout << "(Press any key for more..)";
if (_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
exit(0); // Exit cleanly for Ctrl+C
cout << "\r"; // Overwrite text above
}
}
}
}
}
void Configure::readLicense()
{
Support other platform names on configure.exe Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX and Blackberry. Default is "Windows". Change-Id: Ifa4d1b9c02cda956be9becdf8db195d3d494f1d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-08 13:20:35 +00:00
dictionary["PLATFORM NAME"] = platformName();
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
dictionary["LICENSE FILE"] = sourcePath;
bool openSource = false;
bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL");
configure: Remove -nokia-developer option There's no good reason to still differentiate between 'Nokia' developers, and Qt developers outside of Nokia, inside configure. Just use -developer-build -opensource -confirm-license. Change-Id: I8726947dae0c70412eb52bf9d88eda4aa061ef26 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2012-01-03 15:01:40 +00:00
if (dictionary["BUILDTYPE"] == "commercial") {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
openSource = false;
} else if (dictionary["BUILDTYPE"] == "opensource") {
openSource = true;
} else if (hasOpenSource) { // No Open Source? Just display the commercial license right away
forever {
char accept = '?';
cout << "Which edition of Qt do you want to use ?" << endl;
cout << "Type 'c' if you want to use the Commercial Edition." << endl;
cout << "Type 'o' if you want to use the Open Source Edition." << endl;
cin >> accept;
accept = tolower(accept);
if (accept == 'c') {
openSource = false;
break;
} else if (accept == 'o') {
openSource = true;
break;
}
}
}
if (hasOpenSource && openSource) {
cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
licenseInfo["LICENSEE"] = "Open Source";
dictionary["EDITION"] = "OpenSource";
dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
cout << endl;
if (!showLicense(dictionary["LICENSE FILE"])) {
cout << "Configuration aborted since license was not accepted";
dictionary["DONE"] = "error";
return;
}
} else if (openSource) {
cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl;
dictionary["DONE"] = "error";
}
#ifdef COMMERCIAL_VERSION
else {
Tools::checkLicense(dictionary, licenseInfo, firstLicensePath());
configure: Remove -nokia-developer option There's no good reason to still differentiate between 'Nokia' developers, and Qt developers outside of Nokia, inside configure. Just use -developer-build -opensource -confirm-license. Change-Id: I8726947dae0c70412eb52bf9d88eda4aa061ef26 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2012-01-03 15:01:40 +00:00
if (dictionary["DONE"] != "error") {
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
// give the user some feedback, and prompt for license acceptance
cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " " << dictionary["EDITION"] << " Edition."<< endl << endl;
if (!showLicense(dictionary["LICENSE FILE"])) {
cout << "Configuration aborted since license was not accepted";
dictionary["DONE"] = "error";
return;
}
}
}
#else // !COMMERCIAL_VERSION
else {
cout << endl << "Cannot build commercial edition from the open source version of the library." << endl;
dictionary["DONE"] = "error";
}
#endif
}
void Configure::reloadCmdLine()
{
if (dictionary[ "REDO" ] == "yes") {
QFile inFile(buildPath + "/configure" + dictionary[ "CUSTOMCONFIG" ] + ".cache");
if (inFile.open(QFile::ReadOnly)) {
QTextStream inStream(&inFile);
QString buffer;
inStream >> buffer;
while (buffer.length()) {
configCmdLine += buffer;
inStream >> buffer;
}
inFile.close();
}
}
}
void Configure::saveCmdLine()
{
if (dictionary[ "REDO" ] != "yes") {
QFile outFile(buildPath + "/configure" + dictionary[ "CUSTOMCONFIG" ] + ".cache");
if (outFile.open(QFile::WriteOnly | QFile::Text)) {
QTextStream outStream(&outFile);
for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) {
outStream << (*it) << " " << endl;
}
outStream.flush();
outFile.close();
}
}
}
#endif // !EVAL
bool Configure::isDone()
{
return !dictionary["DONE"].isEmpty();
}
bool Configure::isOk()
{
return (dictionary[ "DONE" ] != "error");
}
Support other platform names on configure.exe Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX and Blackberry. Default is "Windows". Change-Id: Ifa4d1b9c02cda956be9becdf8db195d3d494f1d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-08 13:20:35 +00:00
QString Configure::platformName() const
{
switch (platform()) {
default:
case WINDOWS:
return QStringLiteral("Qt for Windows");
case WINDOWS_CE:
return QStringLiteral("Qt for Windows CE");
case QNX:
return QStringLiteral("Qt for QNX");
case BLACKBERRY:
return QStringLiteral("Qt for Blackberry");
}
}
QString Configure::qpaPlatformName() const
{
switch (platform()) {
default:
case WINDOWS:
case WINDOWS_CE:
return QStringLiteral("windows");
case QNX:
return QStringLiteral("qnx");
case BLACKBERRY:
return QStringLiteral("blackberry");
}
}
int Configure::platform() const
{
const QString qMakeSpec = dictionary.value("QMAKESPEC");
const QString xQMakeSpec = dictionary.value("XQMAKESPEC");
if ((qMakeSpec.startsWith("wince") || xQMakeSpec.startsWith("wince")))
return WINDOWS_CE;
if (xQMakeSpec.contains("qnx"))
return QNX;
if (xQMakeSpec.contains("blackberry"))
return BLACKBERRY;
return WINDOWS;
}
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
bool
Configure::filesDiffer(const QString &fn1, const QString &fn2)
{
QFile file1(fn1), file2(fn2);
if (!file1.open(QFile::ReadOnly) || !file2.open(QFile::ReadOnly))
return true;
const int chunk = 2048;
int used1 = 0, used2 = 0;
char b1[chunk], b2[chunk];
while (!file1.atEnd() && !file2.atEnd()) {
if (!used1)
used1 = file1.read(b1, chunk);
if (!used2)
used2 = file2.read(b2, chunk);
if (used1 > 0 && used2 > 0) {
const int cmp = qMin(used1, used2);
if (memcmp(b1, b2, cmp))
return true;
if ((used1 -= cmp))
memcpy(b1, b1+cmp, used1);
if ((used2 -= cmp))
memcpy(b2, b2+cmp, used2);
}
}
return !file1.atEnd() || !file2.atEnd();
}
QT_END_NAMESPACE
Reference in New Issue Copy Permalink