summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32
Commit message (Collapse)AuthorAgeFilesLines
* qmake vcxproj generator: map TARGET_EXT to $(TargetExt)Joerg Bornemann2012-08-083-2/+12
| | | | | | | | | | Task-number: QTBUG-26782 Cherry-picked from qt5/qtbase commit e81d7fd1e57fe2ce11cbe07636f890973116f7ab Change-Id: I7a93ede18d83d1ecfa74449fc5db76e8b3f6ae99 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: un-copy-and-pastify vcxproj generator a bitJoerg Bornemann2012-08-082-60/+70
| | | | | | | | | | Reusing already built strings improves readability and performance. Cherry-picked from qt5/qtbase commit b4ae57c881455d791f4587978423c47b046a9a4e Change-Id: I62554ffb9100af47ffb4978d51444a4cbbea7572 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0116-32/+32
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* qmake vc(x)proj generator: don't create bogus directoriesJoerg Bornemann2012-04-171-0/+3
| | | | | | | | | | When creating the temporary project object, Option::output_dir must be adjusted temporarily. Task-number: QTBUG-22788 Change-Id: Ibf8897a46b63f48b9e33d7e2168b09e559cecec7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit ac7dd2782f078e66c5240a07fff5a25cdf5ba61b)
* qmake/Win: fix incomplete generated version resourceJoerg Bornemann2012-04-171-1/+11
| | | | | | | | | | | | | | | Since Windows Vista the resource language must be included to make the version information visible in Windows Explorer. Two new variables have been introduced: RC_LANG (default: 1033) - resource language RC_CODEPAGE (default: 1200) - resource codepage Task-number: QTBUG-23218 Change-Id: I29e102d19501e3b7a43d5096fc4806bc38a4d846 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 8987e5d2cb7b7816fd0002fd9ad939ab4f08971b)
* qmake vcxproj generator: fix handling of /MANIFEST:NO linker optionJoerg Bornemann2012-04-171-0/+7
| | | | | | | | | Task-number: QTBUG-23513 Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 31cfe5ca1b5006566051942254d977581a769e3e)
* qmake vcproj generator: unused variable removedJoerg Bornemann2012-04-171-1/+0
| | | | | | Change-Id: Iaf8bb1772846001297e1a421c3860f5e4d090a35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 65425be8fef69733fb1613e1487f3f6b4fb2d472)
* qmake vc(x)project generator: fix VC++ Express detectionJoerg Bornemann2012-04-161-1/+3
| | | | | | | | | | | | | If VC++ 2010 Express and VC# 2010 Express are installed, then the installation path is written in two places into the registry. We're now filtering detected installations with the same installation path. Task-number: QTBUG-24956 Change-Id: I401430e7aa81d96c523d8172d2a2e9d40ebdb3ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 99a207436924aa1339f48ababa1490675c6a00d3)
* qmake: fix default value for C++ optimization in vcxproj filesJoerg Bornemann2012-03-221-0/+4
| | | | | | | | | | | | | | For the debug configuration the optimization should be turned off. This is the completion of the backport of ece75a8adfc30c91f25d45d37f98bf8cda90fdce. Task-number: QTBUG-23421 Change-Id: Ibf30d1e27b3b614bd4b1304d21be76af3faf0249 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* escape *_script_file usages in MingwMakefileGenerator::writeObjectsPartMax Desyatov2012-03-071-4/+4
| | | | | | | (cherry picked from qtbase commit 9d5e721e96f19812a766a4c7d3f8b41f455f507c) Task-number: QTBUG-24595 Change-Id: I761e4ffb0e473c35784cf1ba5289a79dae5a012b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Create target pkgconfig dir in qmake generated Windows MakefilesHib Eris2012-02-291-0/+6
| | | | | | | (cherry picked from qtbase commit cbf8f03cf4f3b0aa49c9f35c9ae0e3304f142ac7) Change-Id: Icea70987ee3c6040ca3ba278a578849cb74156f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Implement missing replacements when installing .pc files for win32Hib Eris2012-02-291-1/+17
| | | | | | | | | | | | | | | | | | | | This implements replacements for win32 makefile generators similar to the replacement functionality in unix makefile generators. To enable Makefile code generation for replacements in win32 makefile generators, you must set QMAKE_STREAM_EDITOR to e.g. sed. When building for win32, sed is normally only available in the mingw/msys build environment and when cross compiling on unix. In these cases QMAKE_STREAM_EDITOR is set to sed in qmake.conf. For other win32 build environments QMAKE_STREAM_EDITOR is not set in qmake.conf and the replacements Makefile code is not generated. (cherry picked from qtbase commit 78faefdbb1ccc296c967dde40e2a7a1c78e4cec2) Change-Id: Ie5de5d517eafaeaa2544f1e972aec3fe11d0a6f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2012-02-071-0/+2
| | | | | | | | | | | With MSVC 2010 if a single configuration vcxproj file was created then it would not have an entry for the .rc file only the .res file that would be compiled from it. Without the entry for the .rc file then it would not compile the .res file. Task-number: QTBUG-22545 Change-Id: Ieb77530ca53c7e76056c18542a3bb7e2d3688d73 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1116-16/+16
| | | | | | | | | 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>
* qmake: fix default value for C++ optimization in vcxproj filesJoerg Bornemann2012-01-061-0/+4
| | | | | | | | | For the debug configuration the optimization should be turned off. Reviewed-by: ossi Task-number: QTBUG-23421 Change-Id: Ib63e0c51f9ab31180ff8ee01a1f6c57ab77e390e
* qmake: fix /MP option for VS 2010Joerg Bornemann2012-01-061-3/+3
| | | | | | | | | Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010. Task-number: QTBUG-23490 Reviewed-by: ossi Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e
* qmake: fix writing of incremental linker option for vcxproj filesJoerg Bornemann2011-10-141-1/+1
|
* qmake vcxproj generator: fix XML conversion for build eventsJoerg Bornemann2011-09-081-2/+2
| | | | | Task-number: QTBUG-20419 Reviewed-by: ossi
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1316-274/+274
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-05-116-37/+25
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e qmake vc(x)proj generator: support x64 Qt builds qmake: remove dead code from VcxprojGenerator qmake nmake generator: pass MAKEFLAGS to sub-make calls
| * qmake vc(x)proj generator: support x64 Qt buildsJoerg Bornemann2011-05-062-9/+14
| | | | | | | | | | Task-number: QTBUG-17911 Reviewed-by: ossi
| * qmake: remove dead code from VcxprojGeneratorJoerg Bornemann2011-05-062-28/+0
| | | | | | | | Reviewed-by: ossi
| * qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-052-0/+11
| | | | | | | | | | | | Unlike other make tools nmake doesn't do this automatically. Reviewed-by: ossi
* | qmake: Introduce new template typeChristian Kandeler2011-05-033-3/+21
| | | | | | | | | | | | The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point). Reviewed-by: Joerg Bornemann
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-183-23/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | make collection of SUBDIRS in solution generator less bizarreOswald Buddenhagen2011-04-122-21/+22
| | | | | | | | | | | | | | | | | | | | | de-duplicate code, and on the way don't try to re-resolve project variables of subprojects against the contents of the top level project. Reviewed-by: mariusSO
| * | run depend_command in build dir in VS generators as wellOswald Buddenhagen2011-04-124-4/+18
| | | | | | | | | | | | | | | | | | followup to b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61 Reviewed-by: mariusSO
| * | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-143-26/+98
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * | Fixed win32-msvc2008 build regression.axis2011-03-042-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We needed to move the code in the init() function to the fixTargetExt() function, which is where the variables are actually used. The reason is that fixTargetExt() runs before init(). RevBy: Miikka Heikkinen
| | * | Made qmake strip trailing \ from libdirs.axis2011-03-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done because trailing \ would confuse the command line parser if the path was also quoted. RevBy: Oswald Buddenhagen
| | * | Added MinGW support for adding lib prefix and extension via profile.axis2011-03-043-9/+19
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | Added support for various special compiler/linker flags on MinGW.axis2011-03-041-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables you to use QMAKE_xxx_yyy, where xxx is either CFLAGS, CXXFLAGS or LFLAGS, and yyy is either APP, SHLIB or PLUGIN. It is basically the same as the one in the UNIX generator. RevBy: Oswald Buddenhagen
| | * | Added support for rvct_linker config in qmake's MinGW generator.axis2011-03-041-3/+11
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-03-042-3/+4
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a mirror of the way the UNIX generator does it. See commits aaf189b084f52 and bdff51768dfe. RevBy: Oswald Buddenhagen
| | * | Added object script support to RVCT when using MinGW qmake generator.axis2011-03-041-8/+38
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | Added Symbian makefile building support using MinGW backend.axis2011-03-041-2/+2
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
* | | | qmake vcxproj generator: fix non flat projects for VS2010Martin Petersson2011-03-221-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filters for files in the non flat projects will start with the base filter name and then the path to the file. So the detection of the filter needs to be done by the start of the filter namse so that we correctly add the compile commands for the added files. Task-number: QTBUG-13928 Reviewed-by: Joerg Bornemann
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-182-4/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake vcproj generator: do not insert $(INHERIT)
| * | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-182-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will remove the warnings about undefined environment variables when building with IncrediBuild. The $(INHERIT) feature does not work in the "Create PCH through file" property of Visual Studio. It expands to an empty string but doesn't yield a warning in a standard VS build. Also, the value of "Create PCH through file" is supposed to be exactly the string as in the include statement of the cpp file. Done-with: Marius Storm-Olsen
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-03-161-3/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (31 commits) SSL: give protocol enum SecureProtocols an own value QMAKE: Fix post build events for VS2010 SSL backend: avoid setting SNI hostname for old SSL versions SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3) SSL: introduce new option TlsV1SslV3 for SSL communication Mac Style: Compile Fix Mac: Center the Window title on Cocoa. Fix corner of scroll area so it is stylable on Mac. QNAM HTTP: Pair channels with requests at a later state. tst_qnetworkreply: fix MiniHttpServer crash Windows: Activate the context menu on tray icons when shown. SSL backend: check at runtime for the right OpenSSL version for SNI QNAM HTTP: Fix the ioPostToHttpFromSocket auto test Disable capabilities example for symbian-gcce due to a bug in elf2e32 Fixed documentation for QByteArray Improve handling QByteArray with QStringBuilder Do not handle posted events in QSplashScreen. SSL tests: Be more verbose in on-demand cert test Fix qstringbuilder test. Wrap qPrintable inside QString ...
| * | | Merge earth-team into masterOlivier Goffart2011-03-151-3/+8
| |\ \ \
| | * | | QMAKE: Fix post build events for VS2010Martin Petersson2011-03-151-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have changed 'Use in build' for VS2010 to now use "Excluded From Build" to have the same as in VS2008. This will enable post build event again for VS2010. Reviewed-by: Joerg Bornemann
* | | | | Revert "qmake vcproj generator: do not insert $(INHERIT)"Joerg Bornemann2011-03-152-7/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit e22c6eb32c4c4c189ba5c11ce61adc8a59a0847b.
* | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-152-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will remove the warnings about undefined environment variables when building with IncrediBuild. Done-with: Marius Storm-Olsen
* | | | | qmake nmake / mingw32-make generators: fix DEF_FILE for shadow buildsJoerg Bornemann2011-03-152-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11643 Reviewed-by: Marius Storm-Olsen
* | | | | qmake: fix the language settings generated Windows resource filesJoerg Bornemann2011-03-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows > XP the version information of for example the Qt DLLs are not visible in the Windows explorer. That's due to missing language information in the version resource. Task-number: QT-4054 Task-number: QTBUG-12249 Reviewed-by: Marius Storm-Olsen
* | | | | qmake vc(x)proj generator: fix handling of DEFINES from .prl filesJoerg Bornemann2011-03-152-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some ancient code putting those defines into MSVCPROJ_DEFINES. This variable was used for the VC6 generator. We just let MakefileGenerator handle the variables of a .prl file now. Task-number: QTBUG-16024 Reviewed-by: Marius Storm-Olsen
* | | | | qmake vc(x)proj generator: set the output directoryJoerg Bornemann2011-03-151-37/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration property OutDir was always set to ".\\". We're now referencing "$(OutDir)" instead of building the path every time from DESTDIR. Also, VCConfiguration::PrimaryOutput was always empty for VS < 2010 and is now unused. The variable MSVCPROJ_LIBOPTIONS was removed. Task-number: QTBUG-16490 Reviewed-by: Marius Storm-Olsen
* | | | | qmake vc(x)proj generator: fix reading of /YX, /Yc, /Yu compiler flagsJoerg Bornemann2011-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Controlling the PCH settings manually via the MSVC compiler flags was broken. Task-number: QTBUG-15594 Reviewed-by: Marius Storm-Olsen
generated by cgit v0.12 at 2025-01-21 10:33:19 (GMT)