summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/win32
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-183-10/+4
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * clean up visual studio identification codeOswald Buddenhagen2011-04-123-10/+4
| | | | | | | | | | | | | | TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is used. Reviewed-by: mariusSO
* | don't add extraneous empty command linesOswald Buddenhagen2011-03-012-2/+2
| | | | | | | | Reviewed-by: mariusSO
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-252-4/+4
|\ \ | |/ | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * don't assign MANIFEST_DIR if we don't need itOswald Buddenhagen2011-01-202-4/+4
| | | | | | | | | | | | | | | | avoids warnings with qmake -Wall about overriding the variable (as typically both scripts are in CONFIG, but only one is actually used). Task-number: QTBUG-13911 Reviewed-by: mariusSO
* | Add comctl32 v6 assembly dependency to applications only (not libraries)miniak2011-01-242-2/+4
|/ | | | | | | | | | | | This improves the patch from merge request #2526 to add the comctl32 v6 assembly dependency to applications only, as it was being done previously (although only when /SUBSYSTEM:WINDOWS, not when /SUBSYSTEM:CONSOLE). Other existing makespecs are not affected, as they still have all flags in QMAKE_LFLAGS, and QMAKE_LFLAGS_EXE is simply empty. Merge-request: 1020 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-021-0/+2
| | | | | | | | | | The option is on when building Qt, but off by default for other projects, due to potential incompatible compile options in other projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor directive) Reviewed-by: bhughes Reviewed-by: ossi
* make various POST_LINK steps nicerOswald Buddenhagen2010-08-312-6/+4
| | | | | | | put each step into a separate make command. that makes for cleaner output and less troubles with command separators. Reviewed-by: mariusSO
* escape backslashesOswald Buddenhagen2010-05-263-9/+9
| | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-172-4/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-142-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* | Added wildcards to allow custom mkspecs namesConstantin Makshin2010-04-292-2/+2
| | | | | | | | | | Merge-request: 2374 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | fix nmake build with win32-msvc2010Joerg Bornemann2010-04-262-2/+2
| | | | | | | | Reviewed-by: Martin Petersson
* | amend "purge msvc.net and msvc2002 makespecs"Oswald Buddenhagen2010-02-171-4/+0
|/ | | | | | | - win32-msvc.net/qplatformdefs.h was included from msvc2003. inline it. - purge references to msvc.net from feature files Reviewed-by: mariusSO
* Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-041-2/+10
| | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
* mingw: make it possible to build without rtti supportThierry Bastian2009-08-181-0/+1
|
* Merge branch '4.5'Marius Storm-Olsen2009-06-301-2/+2
|\
| * Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-2/+2
| | | | | | | | | | | | The configuration option was not added to the Windows configure. Reviewed-by: hjk
* | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-241-0/+4
| | | | | | | | | | | | | | ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
* | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+3
|/ | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* Ensure that the manifest files are placed correctlyAndy Shaw2009-06-082-6/+10
| | | | | | | | If OBJECTS_DIR was empty then it would create a directory for the manifest files in the root directory. This is not desired as it should create a directory in the build directory instead. Reviewed-by: Marius Storm-Olsen
* Turn off Link Time Code Generation (/LTCG) by defaultMarius Storm-Olsen2009-05-131-0/+5
| | | | | | | | | | | | | Turning on LTCG affected too many projects, where customers applications would take a long time linking, severly affecting their development time (even though it was only added for release builds) We turn it off by default, and add a -ltcg configuration option, and the possibility to also do CONFIG+=ltcg in projects, should they not want it for Qt, but in their own projects. (Same, they can build Qt with it, and do CONFIG-=ltcg for their project) Reviewed-by: andy
* Long live Qt 4.5!Lars Knoll2009-03-2319-0/+220
generated by cgit v0.12 at 2024-08-22 18:45:55 (GMT)