summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-msvc2010
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-18/+18
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Add comctl32 v6 assembly dependency to applications only (not libraries)miniak2011-01-241-1/+2
| | | | | | | | | | | | 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>
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higherminiak2011-01-071-1/+1
| | | | | | | | | | | | | | Native Win32 C++ projects created in Visual Studio have this enabled in the default configuration in order to increase security. Merge-request: 2539 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix comctl32 v6 dependency generation in Visual Studio 2005 and higherminiak2010-12-131-3/+3
|/ | | | | Merge-request: 2526 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* msvc: enable unreferenced code elimination in release with debuginfo buildsOswald Buddenhagen2010-11-031-1/+1
| | | | | | | | | that linker optimization is on by default in release builds, so override /DEBUG implicitly turning it off. as it happens, this implicitly disables incremental linking, so that option can go away now. Reviewed-by: joerg Task-number: QTBUG-14007
* Add breakpad supportMarco Bubke2010-09-201-0/+3
| | | | | | | | | | Breakpad is a portable crash handler. It sends the raw crash information to a server for analysis. This analysis needs debug information. Consequently, we compile with debug info even in release mode if qt-breakpad integration is requested (via an environment variable). Reviewed-by: ossi
* 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
* link glu32 before opengl32Oswald Buddenhagen2010-07-011-1/+1
| | | | | | | otherwise the build fails if the libraries are statically built, as glu depends on opengl. Task-number: QTBUG-11863
* escape backslashesOswald Buddenhagen2010-05-261-3/+3
| | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* Added mkspec for MSVC 2010Martin Petersson2010-04-262-0/+133
Reviewed-by: Marius SO