summaryrefslogtreecommitdiffstats
path: root/tools/configure/configure.pro
Commit message (Collapse)AuthorAgeFilesLines
* ... and so configureapp.exe disappearethOswald Buddenhagen2016-12-231-135/+0
| | | | | Change-Id: I3fd9f2b0d4cf05a625484fce21532da8563cd62c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge all "win32-msvc*" mkspecs into oneThiago Macieira2016-12-231-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can tell the MSVC version from the compiler now, each of the qmake.conf files is now the same, so let's just have "win32-msvc" and be future-proof. Likewise for win32-clang-msvc. qplatformdefs.h was already common. Since we can't obtain the MSVC version from the unified mkspec name any more, I dropped the warning level during the qmake bootstrap to reduce the number of warnings that need to be disabled from compiler version to version. There is no point in keeping the old mkspecs, but configure will re-map the -platform argument to the unified spec as necessary, to keep existing configure command lines working. [ChangeLog][Visual Studio] Qt now has a common mkspec for all Visual Studio versions, called "win32-msvc". The old names which contained the version number are now gone (but qmake scopes based on the old names continue to work). The version of the compiler can be obtained from the MSC_VER and MSVC_VER variables (for example, for Visual Studio 2015, those contain the values 1900 and 14.0, respectively). Those variables are also available with the Intel compiler (win32-icc) and with Clang (win32-clang-msvc). Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: Ib57b52598e2f452985e9fffd14587c0a77a5c09c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* move license check to qmake-based configure systemOswald Buddenhagen2016-12-081-2/+2
| | | | | | | | | | | | | this also removes the need for passing pre-processed options via configure.cfg, so get rid of that. a somewhat unfortunate side effect is that the android-style-assets feature had to move back to the top level, as the licensing options depend on it. Started-by: Lars Knoll <lars.knoll@qt.io> Change-Id: Id4d1e0ba18b3e3104400293b8f0c7f2f65e68dea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Clean up building of bootstrap lib and toolsLars Knoll2016-10-111-1/+1
| | | | | | | | | | Add a qconfig-bootstrap.h, which contains all the defines required to build the bootstrapped tools. This will be required anyway when moving more code over to use QT_CONFIG(foo) instead of QT_NO_FOO. Change-Id: I783d0aa0100b9190fe2d422bee4a95b05720aebe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* rename configure.exe => configureapp.exeOswald Buddenhagen2016-10-041-1/+1
| | | | | | | | | | now that the bat file is responsible for displaying the help in addition to bootstrapping configure, the exe file should not shadow it any more. amends c027cffbe. Change-Id: I5c8a52f59ff455575e646fae55cd214db98a3736 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* tools/configure: enable QStringBuilderAnton Kudryavtsev2016-04-081-1/+3
| | | | | | | ... by adding define QT_USE_QSTRINGBUILDER. Change-Id: I89bfdff3f4fc2585649b586ebb5414831cb76765 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-031-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
| * configure: Remove COMMERCIAL_VERSION defineKai Koehne2015-05-271-2/+0
| | | | | | | | | | | | | | Not used anymore. Change-Id: I7db671008758e79598697e06e12f1b959bf479c6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Deinline QRingBuffer classAlex Trotsenko2015-05-201-0/+2
|/ | | | | | | | Reduce the size of .text section in QtCore by 4.5KB and in QtNetwork by 26.5KB. Change-Id: If7998776166b9681c1e4b24c51d40444aa996d7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* De-inline QDebug destructorKai Koehne2014-05-221-0/+1
| | | | | | | | | This injected quite some code on every use of qDebug and friends, while not giving any measurable performance benefits. Change-Id: I7b51f99130f18f1252da01e313f7b97c43a5480d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-01-171-1/+1
| | | | | | | | Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Implement support for ref-qualified QString::toLatin1 & friendsThiago Macieira2013-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step in implementing an in-place conversion of QString to QByteArray. This requires ref-qualifiers in member functions so we know that we have an rvalue QString. Converting from UTF-16 to Latin1 always requires half the memory. For conversion from UTF-16 to UTF-8, the typical string will also need the same memory or less: characters from U+0000 to U+007F consume one fewer byte; characters from U+0080 to U+07FF and from U+10000 to U+1FFFFF occupy the same space in UTF-8 and UTF-16; it's only the ones from U+0800 to U+FFFF that consume more space in the UTF-8 string. For the locale's 8-bit codec, we can't be sure and the code (currently) needs to go through QTextCodec anyway. This requires a #define set before #include'ing "qstring.h". However, since qstring.h is included by the QtCore PCH, we need an extra qmake compiler without the PCH flags to compile this .cpp. After this change, the distribution of calls in QtCore, Network, Gui, and Widgets is as follows: const & && toUtf8 31 (74%) 11 (26%) toLatin1 79 (77%) 24 (23%) toLocal8Bit 26 (16%) 138 (84%) Change-Id: Idd96f9ddb51b989bc59f6da50054dd10c953dd4f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Improve path search in configure.Friedemann Kleint2012-11-051-0/+3
| | | | | | | | | | | | | | - Remove duplicated code locateFile/locateFileInPaths. - Move basic path search functionality to Environment. - Add functions for headerPaths/libraryPaths to Environment. - Use QStandardPaths::findExecutable(). - Replace Environment::detectExecutable by QStandardPaths::findExecutable(). - Introduce static path lists in findFile() to avoid repeated directory scans Change-Id: I9b93066a3de65f40527780d6ddf7989bca35cd04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix compile errors in configure.exe.Jason Barron2012-10-161-3/+0
| | | | | | | | | | | qstringmatcher.cpp and qchar.cpp are included in qstring.cpp and qunicodetables.cpp is included in qchar.cpp so these files should not be compiled as standalone objects. Change-Id: I323e0878af28b9e5fb2f659fb8077347b93fa439 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't require a fake qconfig.h for the configure bootstrapOswald Buddenhagen2012-09-191-1/+1
| | | | | Change-Id: I3d1224ad19b9e5278e35cf7c5142a29ccb589140 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QUrl is not necessary for configure.exe, drop it from the .proThiago Macieira2012-08-151-1/+0
| | | | | | | | | | | qurl.cpp was removed from the Makefiles on 6ab6b0fc1c594a589d96d17b5ab7, but I missed the .pro file. You're not supposed to use the .pro file anyway, it's just for opening in Creator. But if you forget to remove the qmake build step, it would get compiled. Change-Id: Ia52ae7349e195df58f76f8d2c5f8b46adfdc7454 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clean up the use of QT_NODLLThiago Macieira2012-06-281-1/+1
| | | | | | | | | | QT_NODLL is replaced by QT_STATIC, but the latter is implied if QT_BOOTSTRAPPED is already defined. Therefore, simply remove the QT_NODLL definitions. Change-Id: Iac7ec0b494b7a78197c25d59547f45eaf92d7465 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove -DQT_NO_STL from the bootstrapped buildsThiago Macieira2012-04-071-1/+1
| | | | | Change-Id: I37ea06426b66e617a49ec46952abdaad8814eadf Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Compile QArrayData in bootstrap phase.Jędrzej Nowacki2012-03-291-0/+4
| | | | | | | | | This change will be needed during migration from QByteArrayData to QArrayData. Change-Id: I0c8d6f9ed3ef7c33af62736af55259a8f9a70c0f Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Split up base class QFileDevice for open-file operations (read/write)David Faure2012-03-061-0/+2
| | | | | | | | | This will be used later on as a base class for QTemporaryFile and QSaveFile. Change-Id: Ic2e1d232f95dc29b8e2f75e24a881ab459d3f037 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* compile without rttiOswald Buddenhagen2012-02-091-1/+1
| | | | | | | no point in it Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove pointless include pathsOswald Buddenhagen2012-02-091-6/+0
| | | | | | | we rely on a syncqt'd tree anyway Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* properly enable stl via qmake instead of hacking compiler flagsOswald Buddenhagen2012-02-091-2/+1
| | | | | Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* build with QT_NO_GEOM_VARIANTOswald Buddenhagen2012-02-091-5/+1
| | | | | | | saves us some pointless code Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Allow customization of qDebug output at runtimeKai Koehne2012-02-091-0/+2
| | | | | | | | | | | | | Check the QT_OUTPUT_PATTERN environment variable in the default message handler to customize the output of messages. Following place holders are right now supported: %{message}, %{type}, %{file}, %{line}, %{function} The original cleanupFuncinfo was written by Thiago Macieira. Change-Id: I6ad25baaa0e6a1c9f886105d2a93ef3310e512a9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: David Faure <faure@kde.org>
* Fix building of configure.exe.Friedemann Kleint2012-01-251-0/+2
| | | | | | | Add missing files to profile. Change-Id: I72ccbbbef3e036fc0cfe7a0a6df4c19d0474b798 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* configure.exe: Reduce size by using -O1 instead of -O2.Friedemann Kleint2011-11-181-2/+4
| | | | | Change-Id: Ica4d19364415180411cd74df7c3fb92d0100bfba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove symbian support from configureJoerg Bornemann2011-11-071-2/+0
| | | | | Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix the build of configure.exe.Liang Qi2011-05-101-0/+2
| | | | | | | | qlocale functions were splitted in severl files, just add them back. Task-number: QTBUG-18932 Reviewed-by: TrustMe (cherry picked from commit 3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf)
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-0/+2
| | | | | | | 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.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+132
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 22:28:17 +0000