summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/win32
Commit message (Collapse)AuthorAgeFilesLines
* ANGLE: Fix static build.Friedemann Kleint2013-02-251-0/+1
| | | | | | | | | | | | | Introduce QT_OPENGL_ES_2_ANGLE_STATIC define for static builds and modify export accordingly. Provided static instances of gl::Current and egl::Current for Qt's single threaded use. Task-number: QTBUG-28196 Change-Id: Ia75699d6da103fb8dd9d5fe97c1ee51e48a74406 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove win32/thread.prf and thread_off.prfStephen Kelly2012-12-142-24/+0
| | | | | | | | | | | The variables these files refer to are not set anywhere anymore. The Unix thread.prf file is still needed, as it is still effective and is activated by qt.prf. Task-number: QTBUG-25106 Change-Id: Ia514192d28785205df3710d78ee597285d4136b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* ANGLE: Fix debug-and-release buildsFriedemann Kleint2012-12-011-1/+6
| | | | | | | | | | | | | | | Add a 'd' to debug builds to allow both release and debug builds to be used. - Add .def-files for Debug - Build all libraries debug/release - Add description to README.qt - Differentiate debug/release in qmake.conf. Task-number: QTBUG-28196 Change-Id: Ib3081004a6ed2ad71d353244154684d2e0ebbc86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* don't link qtmain.lib when using idcidl.prfJoerg Bornemann2012-11-301-0/+3
| | | | | | | | QAxServer projects must not link qtmain.lib. This awful hack was adapted from the old qaxserver.prf Change-Id: I78b4cbf6714bfbd88341449b9230f1989cff8a6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* adjust to modularization changes in ActiveQtJoerg Bornemann2012-11-272-27/+0
| | | | | | Task-number: QTBUG-27776 Change-Id: I1c30270867d20f028bad09fdc5408a414b122f5b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't make the outputs depend on $$QMAKE_DUMPCPPOswald Buddenhagen2012-09-191-2/+1
| | | | | | | | | | the variable can contain a complex command which would make a mess of the makefile. also, the tool doesn't change all that often, so it's not particularly useful to depend on the binary. Change-Id: I965d6555cb22bd6d5306b324f5cad0d747128e99 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove 3rd parameter from qtPrepareTool()Oswald Buddenhagen2012-09-181-1/+1
| | | | | | | it's been superseded by the QTTOOL.* module stuff. Change-Id: I01c9fc3ebbb22111bfb03f82693c7cf08b5fc9d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove left-overs of the borland compiler supportJoerg Bornemann2012-09-111-1/+0
| | | | | | | | Task-number: QTBUG-27184 Change-Id: Iae974c919871753500ca7e5cebdd5ef41fdd7a8a Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: support incremental linking when embedding manifestsJoerg Bornemann2012-08-162-24/+0
| | | | | | | | | | | | | | | | | | | | When embedding manifests we modified the EXE/DLL after linking using the manifest tool. This breaks the incremental linking feature of MSVC. The MS way to embed a manifest without breaking incremental linking is: - let the linker create the manifest file, - create a resource that contains the manifest file, - invoke the linker again to embed the resource. The embed_manifest_{exe|dll}.prf files have been removed. All manifest logic is now in qmake's nmake makefile generator. With QMAKE_MANIFEST one can specify a custom manifest file that gets embedded without disturbing incremental linking. Task-number: QTBUG-22718 Change-Id: Idb9d2644a0577b2002cbdd2d62b695b9171b1bd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix conditions in embed_manifest_*.prfJoerg Bornemann2012-08-092-2/+2
| | | | | | | MSVC 2012 was ignored. Change-Id: I41b2dff85c037ce8057c91036434aa26cd9b5d5c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix host vs. makefile directory separator messOswald Buddenhagen2012-07-282-2/+2
| | | | | | | | | | | | | | | | | the system path separator and shell are bound to the host system (system() will use cmd even on mingw with sh.exe in path). the makefiles otoh may depend on what the qmakespec defines. consequently, add $$system_path() and $$system_quote() (for use with system() & $$system()). $$native_path() is renamed to $$shell_path() and should be used with $$shell_quote() to produce command lines in makefiles. $$QMAKE_DIR_SEP needs to be applied to Option::dir_sep right after parsing the spec, so it is available to $$shell_{path,quote}(). Change-Id: If3db4849e7f96068cf03a32348a24f3a72d6292c Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* make use of new functionsOswald Buddenhagen2012-07-162-2/+2
| | | | | | | makes for cleaner code Change-Id: I1a86bc4cac3778a1df37aa3307e5a8edac246961 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* automatically fix separators in QMAKE_{DIST,}CLEANOswald Buddenhagen2012-07-162-2/+2
| | | | | | | it's a tad insane to expect the user to do that Change-Id: I75c68f2a28656c9ba2e3fabcc79718b899b29ce7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* use real qmakespec as basis for finding featuresOswald Buddenhagen2012-06-271-11/+0
| | | | | | | | | | doesn't make much of a difference on unix (as the default specs are just symlinks). on windows, it makes the gross hack used for finding spec-specific wince default_post.prfs unnecessary. Change-Id: Id403dce5be487e1ae22c1f54b8095a6afdd98bc8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* correctly find idc even for makefilesOswald Buddenhagen2012-06-191-1/+2
| | | | | | | | this is a qt tool, so it needs appropriate treatment Change-Id: I0cb30ba07e03c72ee275cd916ca0a39a99fc3705 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove ACTIVEQT_IDC assignment from QMAKE_IDCOswald Buddenhagen2012-06-191-1/+0
| | | | | | | the specs have been cleaned of it Change-Id: Ica0ab4d5f9d36f1f9566759326f3b3144e34cd67 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Windows: Add ANGLE support.Friedemann Kleint2012-05-311-2/+15
| | | | | | | | | | | | | | | | | | - Add QWindowsEGLContext usable for ANGLE and Windows CE. - Add QWindowsEGLStaticContext containing the display for resource cleanup. - Add EGLSurface to QWindowsWindow. - Add a -angle option specifying the path to the external ANGLE installation to configure, add libraries to the mkspecs. Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com> Task-number: QTBUG-24207 Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* win32/default_pre.prf: Remove exceptions_off, thread_off, stl_off.Friedemann Kleint2012-05-211-1/+1
| | | | | | | | | | | | - thread_off, stl_off are obsolete. - exceptions_off causes exceptions to be globally disabled for applications using MinGW after 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c. Change-Id: Ia109c5806f2a0172efed5680a55ca53a2846d778 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-172-10/+0
| | | | | | | | | | | | | This significantly reduces the size of the generated code in places where we don't need exceptions. The -(no-)exceptions configure flag has been removed in the process, as there is now a fine grained way to control this on a per module level, and Qt is being compiled without exceptions in most places. Change-Id: I99a15c5d03339db1fbffd4987935d0d671cdbc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* delete dumpcpp.prfOswald Buddenhagen2012-03-081-11/+0
| | | | | | | | it seems to be a no-op. presumably it was meant to be an auto-rebuild hack like in moc.prf, but it wasn't really "wired". Change-Id: I914456f5f5a63a06c2004b16edcf2e2ade448270 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove the QT_THREAD_SUPPORT definesBradley T. Hughes2011-12-061-4/+0
| | | | | | | | | | These are no longer used. Qt 3.x used them to enable thread support (which was optional at the time), but starting with 4.0, thread support is always enabled, and these defines were removed from the code. Change-Id: I4d1c75171c263383fc055d2a7fe52ca0501acd7a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Changed path references to ActiveQt.axis2011-04-272-0/+7
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2722-0/+236
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 09:14:21 +0000