summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pro
Commit message (Collapse)AuthorAgeFilesLines
* s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-04-301-2/+2
| | | | Reviewed-by: joerg
* Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-211-1/+2
| | | | Reviewed-by: Marius SO
* Factored readRegistryKey implementation out of qmakeaxis2010-02-231-0/+4
| | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen (cherry picked from commit 5254184c07b4da800e29000a251ed2a026bd2be5) Conflicts: qmake/Makefile.unix
* Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-211-4/+0
| | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. Conflicts: qmake/Makefile.unix
* Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-191-0/+4
| | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
* Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-191-4/+0
| | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. It breaks non-Symbian platforms.
* Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-181-0/+4
| | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
* Added QMake directory to INCPATH so the compiler can find required headersConstantin Makshin2010-02-081-4/+10
| | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Merge commit 'qt/master'Jason Barron2009-08-211-4/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * remove final traces of qtscript from qmakeKent Hansen2009-08-061-4/+2
| |
* | Merge commit 'qt/master-stable'Jason Barron2009-07-291-0/+1
|\ \ | |/
| * Fix qmake.pro so it can build qmake.Jason Barron2009-07-271-0/+1
| | | | | | | | | | | | | | | | qmake now uses a few of the files from the 'codecs' directory so add that directory to the VPATH directory such that building qmake using this .pro file is possible. Reviewed-by: TrustMe
| * Long live Qt!Lars Knoll2009-03-231-0/+25
|
* Long live Qt for S60!axis2009-04-241-0/+26
generated by cgit v0.12 at 2024-11-11 12:41:43 (GMT)