summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32
Commit message (Collapse)AuthorAgeFilesLines
* port qmake to qt creator's qmake language evaluatorOswald Buddenhagen2012-09-111-2/+7
| | | | | | | | | | | | | | | | | | | | | this is a monster commit which does the following things: - import the evaluator as-is from qt creator into qmake/library/ - integrate it into qmake's makefiles - overwrite proitems.h with actual special types - remove the parts of Option which are redundant with QMakeGlobals - make QMakeProperty a singleton owned by Option::globals. the dynamic handling so far made no sense. - make QMakeProject a subclass of QMakeEvaluator, with relatively few extensions the changes to existing qmake code outside project.* and option.* are minor. implementing the changes gradually would mean changing a lot of code which will be just replaced in the next commit, so i'm not wasting my time on it. Change-Id: I9746650423b8c5b3fbd8c3979a73228982a46195 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce qmake variable abstractionsOswald Buddenhagen2012-09-071-1/+1
| | | | | | | | this is preparation for adapting to a new evaluator. Change-Id: I6fc59f5525735754a00afa6629fbfe257e84db97 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* unify c*flags in the hand-written makefiles somewhatOswald Buddenhagen2012-09-031-4/+5
| | | | | Change-Id: I7a7139fd71bce879b3ee4d9e26e30d2ca63da69e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Rename msvc11 to msvc2012Andreas Holzammer2012-08-071-2/+2
| | | | | | | | | Microsoft has named their new Visual Studio again after the old naming schema. Change-Id: Ib1b971807fa89d90b10892a2d78570058e564f3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Remove references to Borland and bmakeAndy Shaw2012-08-011-1/+1
| | | | | | | | | Remove references to an old compiler that has not been supported for a long time. Also remove Borland specific configuration flags which have no meaning elsewhere. Change-Id: I3634a52b78f737ea972073e14c2b6669dcd0ae63 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>
* Fixed Wince Makefile environmentBjoern Breitmeyer2012-06-191-1/+1
| | | | | | | | | Integrated the checksdk tool into qmake and made the makefiles selfcontained, so configure make, is now enough to build qt for wince Change-Id: I29076702eca2ec23d4d06bb3d5c5cef9d4f95161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add Visual Studio 11 mkspecAndreas Holzammer2012-05-161-2/+2
| | | | | | | | | | | 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>
* 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/+1
| | | | | | | | | 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>
* Disable QUrl support in QVariant in bootstrapped modeThiago Macieira2012-03-241-1/+0
| | | | | | | | | | The only use of QUrl in qmake, moc, uic and rcc is due to QVariant's internals, so let's disable it. This means those binaries are now probably a lot smaller since the parsing and IDNA code don't need to be present. Change-Id: Ie156b0817d119b2ba5d3dcb9712a9fea2ee7d4a1 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Merge master into api_changesKent Hansen2012-03-191-1/+1
|\ | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
| * Win32: Compile qmake when shadow-buildingMarius Storm-Olsen2012-03-181-1/+1
| | | | | | | | | | Change-Id: I803c733f744372701c51e4d629ff797c6648f833 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Build qmake with QStringBuilder.Olivier Goffart2012-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | QStringBuilder will be enabled by default so qmake should build with it. qstringbuiler.cpp has to be compiled in just for the convertFromAscii (The alternative was to build with QT_NO_CAST_FROM_ASCII, but that would be too much work) Change-Id: I1fbeed7ed8a9d3bc38ef591a687c50644980e2fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-03-121-1/+3
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
| * do not copy/symlink qmake to build dirOswald Buddenhagen2012-03-091-1/+3
| | | | | | | | | | | | | | make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Split up base class QFileDevice for open-file operations (read/write)David Faure2012-03-061-0/+1
|/ | | | | | | | | 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>
* remove some bogus include locationsOswald Buddenhagen2012-03-011-2/+0
| | | | | | | | nothing to be found in <sourcedir>/include. neither in <builddir>/src/corelib/xml. Change-Id: I381391a64542dc2ac7b421b6646c60a1b7a14639 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* lower qmake optimization level on msvcOswald Buddenhagen2012-02-101-1/+1
| | | | | | | | | -O2 triggers an optimizer bug where compiling unixmake*.cpp would take several minutes each. -O1 is not measurably slower, so use that instead. Change-Id: Ibf8abbecdd69e35cef800841f781543121168f76 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Allow customization of qDebug output at runtimeKai Koehne2012-02-091-2/+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>
* Remove unused -DQT_NO_PCRE from qmake makefilesGiuseppe D'Angelo2011-12-231-1/+1
| | | | | | | | That define is not used anymore when building qmake. Change-Id: I6a478cf4bb6cc8dfe87a3cc96f1d520b08e4ba6f Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix makefiles againOswald Buddenhagen2011-11-111-1/+1
| | | | | Change-Id: I981a62e8884f5c68e3f6c4b7b2f142bf75007f99 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmake: remove symbian supportJoerg Bornemann2011-11-071-12/+4
| | | | | Change-Id: I1db834500921681676a6f46e7750bdd81bf0093d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qsystemlibrary needs no special treatmentOswald Buddenhagen2011-09-121-3/+0
| | | | | | | | | | | this was just a merge artifact (cherry picked from commit 4ac87b7042f7b08e8b427e21d74aa8d224b186bc) Change-Id: Ifa0638982fe48fda2e8d9aa7ee43029187330f02 Reviewed-on: http://codereview.qt-project.org/4574 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-2/+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/+218
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