summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/win32
Commit message (Collapse)AuthorAgeFilesLines
* Fix VS project generation for ActiveQt server projectsJoerg Bornemann2017-05-231-7/+2
| | | | | | | | | Remove VS 6 support code that was erroneously triggered. Task-number: QTBUG-60895 Change-Id: I12c0afe09e8fb200e5050c83ac5f34ad2376fd2e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Restore behavior of using libEGL and libGLESv2 as default for angleOliver Wolff2017-05-111-0/+10
| | | | | | | | | | | | | | | | | As Qt applications using OpenGL are linked against these libs, merging them into QtANGLE by default (780105f9062dec350bbe2a6800c40db3e6382578) was a binary incompatible change. This change restores the default behavior to the one before given change. If the user wants the libraries to be merged, he can pass combined-angle-lib to configure. Task-number: QTBUG-60373 Change-Id: Iedbd3f2ce9284fdde924cfae8d915d6d5fef00db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-081-1/+1
|\ | | | | | | | | | | | | | | Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
| * win32/default_pre.prf: remove unused incremental_off CONFIGThiago Macieira2017-01-311-1/+1
| | | | | | | | | | | | | | | | Nothing uses this and there's no incremental_off.prf since the MSVC6 purge in 99f390f9 (dec 2009). Change-Id: I2bc52f3c7a574209b213fffd149b4bf378805969 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/network/network-chat/peermanager.cpp src/widgets/util/qsystemtrayicon.cpp src/widgets/util/qsystemtrayicon_qpa.cpp src/widgets/util/qsystemtrayicon_win.cpp src/widgets/util/qsystemtrayicon_x11.cpp Change-Id: I1c026df83818c0ccaf956980370e7522960627db
| * Remove the -no-rtti option from configureThiago Macieira2017-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | It only applied to Windows (not MSVC, like the help said) and the build was broken with this option. So remove it, as we clearly never test this. [ChangeLog][Windows] The -no-rtti configure option was removed, as Qt 5.8 fails to build under that condition. To disable RTTI on user code, add to your .pro file: CONFIG += rtti_off. Change-Id: I2bc52f3c7a574209b213fffd149aae1b8d0cf9df Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-251-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
| * prevent configure from putting garbage into .qmake.stashOswald Buddenhagen2017-01-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | in cross-builds, toolchain.prf was loaded before CROSS_COMPILE was set up, leading to caching of possibly nonsensical values. this change also necessitated that msvc-version.conf is loaded only when toolchain.prf is, which is best done by loading the former from within the latter. that seems quite appropriate in the first place. Change-Id: I62577e827a75e335e03df016bd1aa1932643fd6c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Remove hard-coded MS compiler versions from the mkspecsThiago Macieira2016-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | We're asking the compiler anyway, so we can fully use this information just as well. Note that this actually happens after the spec itself has been processed, so it was necessary to delay the version-specific flag handling as well. Change-Id: Ib57b52598e2f452985e9fffd14587b581d946022 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Enable support for OpenVGAndy Nichols2016-11-171-7/+0
|/ | | | | | | | | | | | | | | | | | | This commit re-enables support for OpenVG in Qt, but not in the same way as in Qt 4.8. The first part is about adding a test and using the new configure system to enable OpenVG. There is still support code in Qt for setting up EGL to provide a surface and context for rendering with the OpenVG API, this commit enables a path to do so. Normally to get access to an EGLContext from a QWindow you do so via QOpenGLContext, but in setups without OpenGL but with EGL and OpenVG this doesn't make sense (there would be no QOpenGLContext). So the intended way is to use a QWindow to get an EGLSurface, then create an EGLContext directly (without going through QPA). Change-Id: I0f75aadbaa3cd006deb7e6fd12cfbb574870fba4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Don't define QT_OPENGL_ES_2* in opengl.prfLars Knoll2016-08-191-2/+1
| | | | | | | | | | | Defining QT_OPENGL_ES_2 would only lead to conflicts with defines from qconfig.h. QT_OPENGL_ES_2_ANGLE also moves to the .pri. QT_OPENGL_ES_2_ANGLE_STATIC is not used and is removed altogether. Change-Id: I614fb00525ac696e066ac8328bb9bf61fca08a01 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Use qtConfig throughout in qtbaseLars Knoll2016-08-192-5/+5
| | | | | | | | | | | Use the new qtConfig macro in all pro/pri files. This required adding some feature entries, and adding {private,public}Feature to every referenced already existing entry. Change-Id: I164214dad1154df6ad84e86d99ed14994ef97cf4 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* remove spurious QT_CONFIG -= openglOswald Buddenhagen2016-08-181-1/+0
| | | | | | | | | it's not quite clear what the purpose of this is supposed to be, especially given that the prf is loaded way after anyone would have examined QT_CONFIG. Change-Id: Ia49377c952902fed4084178c7f857e1acd11ad03 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove the -target command line optionLars Knoll2016-07-053-12/+2
| | | | | | | | | | | This was only used to specify XP as a target which is not supported on 5.8 anymore. Clean up all associated special handling in the mkspecs and pro files. This effectively reverts change 10a0ac75. Change-Id: I420d73002912989f1a5be961a2d09277ec4a4425 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-07-011-3/+3
|\ | | | | | | | | | | | | | | Conflicts: configure configure.json Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808
| * don't override user-provided dependencies for our extra compilersOswald Buddenhagen2016-06-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | while the names of the compilers are actually an undocumented internal, we don't provide an actually working proper way to sequence extra compiler execution with build-time generated inputs when they are indirectly listed (as via .qrc files). Task-number: QTBUG-54299 Change-Id: I269c26512897b72706dc8b769aa47e8157c2a5c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-131-0/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config_help.txt configure mkspecs/features/uikit/sdk.prf src/corelib/global/qhooks.cpp src/corelib/io/qfilesystemwatcher.cpp src/corelib/io/qlockfile_unix.cpp src/corelib/tools/qalgorithms.h src/gui/kernel/qwindowsysteminterface.h src/gui/text/qtextdocument_p.cpp src/network/access/access.pri src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplynsurlconnectionimpl.mm src/src.pro src/testlib/qtestcase.cpp src/widgets/kernel/qwidgetbackingstore_p.h src/widgets/styles/qwindowscestyle.cpp src/widgets/styles/qwindowsmobilestyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp tools/configure/configureapp.cpp Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-061-0/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf config.tests/unix/nis/nis.cpp mkspecs/unsupported/freebsd-g++/qplatformdefs.h src/corelib/tools/qdatetime.cpp src/corelib/tools/qsimd.cpp src/corelib/tools/qsimd_p.h src/network/access/access.pri src/network/access/qnetworkreplynsurlconnectionimpl.mm src/network/access/qnetworkreplynsurlconnectionimpl_p.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/printsupport/windows/qwindowsprintdevice.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp tests/auto/network/access/qnetworkreply/BLACKLIST tests/auto/widgets/widgets/qopenglwidget/BLACKLIST Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
| | * Enable -separate-debug-info for mingw toolchainsUlf Hermann2016-05-231-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having the debug info in separate files is very helpful, especially on memory constrained 32bit systems. When the debug info is compiled into the object files, processes can run out of memory when trying to load them. Change-Id: I1808a32e855d6a62e17e1b734c511b31db5f03f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-031-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/3rdparty/double-conversion/include/double-conversion/utils.h src/corelib/global/qnamespace.qdoc src/corelib/tools/qsimd_p.h tests/auto/corelib/io/qfile/tst_qfile.cpp Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34
| * | make extra compiler targets depend on their respective compilerOswald Buddenhagen2016-04-181-0/+1
| |/ | | | | | | | | Change-Id: I6c04e0188137f6bbfeab243f00860b8ff079f69a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* / qmake: Remove Windows CE support.Joerg Bornemann2016-03-102-27/+17
|/ | | | | | | The platform has been removed in Qt 5.7. Change-Id: Ie768b5ffbe60270c27b4a670dcf580ea361cb361 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fixed recently added "excess colon in front of brace" qmake warningOliver Wolff2016-01-062-2/+2
| | | | | Change-Id: I3a650bb4e27cad00f639e6445c36fa8b69edb5b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-151-0/+14
|\ | | | | | | Change-Id: I004854a25ebbf12b1fda88900162fe7878716c58
| * fix dependencies for generated headers from TYPELIBSJoerg Bornemann2015-04-041-0/+14
| | | | | | | | | | | | | | | | | | | | Dependencies to all header files generated by dumpcpp are now added to every object file. This fixes parallel builds of projects that use TYPELIBS. Change-Id: I3c0456c7b182a42296ec6999aa86d1293ffd2e42 Task-number: QTBUG-45118 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Upgrade ANGLE to 2.1~99f075dade7cAndrew Knight2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This aligns with Chromium branch 2356. This version brings more complete OpenGL ES 3 support as well as various bug fixes and performance improvements. The following changes were made to earlier patches: -0000-General-fixes-for-ANGLE-2.1 Removed. All changes are now handled elsewhere. +0001-ANGLE-Improve-Windows-Phone-support Consolidated remaining parts from 0009/0010. +0002-ANGLE-Fix-compilation-with-MinGW Remaining issues from patch 0016. +0003-ANGLE-Fix-compilation-with-MSVC2010 Remaining issues from patch 0015. +0004-ANGLE-Dynamically-load-D3D-compiler-from-list Renamed from patch 0008. +0005-ANGLE-Add-support-for-querying-platform-device Renamed from patch 0013. -0004-Make-it-possible-to-link-ANGLE-statically-for-single Removed. Fixed by adding defines to project files. -0008-ANGLE-Dynamically-load-D3D-compiler-from-a-list-or-t Renamed to patch 0005. -0009-ANGLE-Support-WinRT Removed. Mostly fixed upstream; remaining parts in patch 0001. -0010-ANGLE-Enable-D3D11-for-feature-level-9-cards Removed. Mostly fixed upstream; remaining parts in patch 0001. -0012-ANGLE-fix-semantic-index-lookup Removed. Fixed upstream. -0013-ANGLE-Add-support-for-querying-platform-device Renamed to patch 0005. -0014-Let-ANGLE-use-multithreaded-devices-if-necessary Removed. No longer needed. -0015-ANGLE-Fix-angle-d3d11-on-MSVC2010 Moved remaining parts to patch 0003. -0016-ANGLE-Fix-compilation-with-MinGW-D3D11 Moved remaining parts to patch 0002. -0017-ANGLE-Fix-compilation-with-D3D9 Removed. Fixed upstream. -0018-ANGLE-Fix-releasing-textures-after-we-kill-D3D11 Removed. Fixed upstream. -0019-ANGLE-Fix-handling-of-shader-source-with-fixed-lengt Removed. Fixed upstream. -0020-ANGLE-Do-not-use-std-strlen Removed. Fixed upstream. -0020-ANGLE-Fix-compilation-with-MSVC2013-Update4 Removed. Fixed upstream. [ChangeLog][Third-party libraries] ANGLE was updated to Chromium branch 2356 (2.1~99f075dade7c). Change-Id: I32ccbfe95e10986bd94be7191dfd53445ea09158 Task-number: QTBUG-44815 Task-number: QTBUG-37660 Task-number: QTBUG-44694 Task-number: QTBUG-42443 Reviewed-by: Andrew Knight <qt@panimo.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | provide a way to disable only the axserver registrationOswald Buddenhagen2015-03-271-1/+2
| | | | | | | | | | | | | | | | ... without disabling the idc/idl compilation. Change-Id: I600c9461ece8ad85e763b9eea83345bfe1de825f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | revisit dumpcpp ruleJoerg Bornemann2015-03-251-1/+1
| | | | | | | | | | | | | | Instead of calling "dumpcpp -donothing", well, do nothing. Change-Id: Ifa8da9691de0d5ebade51067b8112da95d87ff44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Fix VS build for target path with spacesOswald Buddenhagen2015-02-261-2/+2
|/ | | | | | | | VS expects references to $(TargetPath) to be quoted by the user. Task-number: QTBUG-25030 Change-Id: Ib5a07730836a42533d5488882e877074ccceea4c Reviewed-by: Prasanth Ullattil <prasanth.u@gmail.com>
* windeployqt: add clean step to toplevel makefileMaurice Kalinowski2015-01-061-1/+2
| | | | | | | | | | Currently you could only invoke windeployqt for debug and release builds, but not windeployqt_clean resulting in artifacts after the clean step. Change-Id: I3a93e4909a017f3594cc5b0c2249ed25b777c008 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andrew Knight <qt@panimo.net>
* WinCE: fix DLL build errors with CONFIG+=consoleJoerg Bornemann2014-10-081-0/+1
| | | | | | | | | | | | | | Since commit cd1dff75, we use QMAKE_LFLAGS_CONSOLE when linking DLLs that are built with CONFIG+=console. Thus, we must not pass options that are specific to linking executables. [ChangeLog][qmake] WinCE makespecs must not add /ENTRY: to QMAKE_LFLAGS_CONSOLE and more. The flag is hard-coded in console.prf now. This is a side effect of making it possible to specify a subsystem for DLLs. Change-Id: Ib481fd45b12140f9f05bf123db7152a3ddf0fa04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* pass windows/console linker flags to DLLs and executablesJoerg Bornemann2014-10-062-7/+5
| | | | | | | | | | | | | Pass QMAKE_LFLAGS_WINDOWS and QMAKE_LFLAGS_CONSOLE to QMAKE_FLAGS regardless of the project template. The /SUBSYSTEM linker switch is not exclusively meant for executables but can also be applied when linking dynamic libraries. This is needed when building DLLs for Windows XP with VS >= 2012. Task-number: QTBUG-41504 Change-Id: I5966cba1b6756e15275fa5d7fdbc42b99c95c07b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add link-time optimization support for Clang, GCC and ICCThiago Macieira2014-07-231-5/+0
| | | | | | | | | | | | | | | GCC currently requires fat object files for static libraries, since the linker would otherwise not load the .o file from the archive at all and the linking would fail with a lot of undefined references. Clang on Linux also needs this, but it has no equivalent flag, so enabling LTCG for Clang on static libraries will result in linker error. This commit does not add support for enabling it in configure. It can be enabled on a per-project basis by doing CONFIG += ltcg or by passing -config ltcg to qmake's command-line. Change-Id: I52cf99f1ed9f1701e23a3b457ba3502fd28126ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* untangle use of system vs. shell path(-list) semanticsOswald Buddenhagen2014-04-301-3/+3
| | | | | | | | | | | | | | | "system" refers to the system's native shell, which is what qmake's system() invokes, and whose convention by far most commands invoked from a makefile will need. "shell" refers to the shell invoked by make, which diverges from the system shell only when qmake/mingw32-make is called from an msys shell. its conventions need to be used for anything the shell itself does (e.g., assembling env variables, but also command line argument unquoting) and the commands the mkspec sets according to the shell (e.g., QMAKE_MOVE). Change-Id: I0000aa9417c199cf8a810619d31ded24bb0675f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix qtmain's .prl file not being usedOswald Buddenhagen2014-04-301-0/+2
| | | | | | | | | | | at some point we stopped adding the qtmain's library path before its respective -l flag, which lead to qmake being unable to resolve the library location and thus ignoring its prl file. Change-Id: I390a31f8ac2877d3823dfd2787b2cc8c696b0ec0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Windows XP target support for MSVC >= 2012Joerg Bornemann2014-04-033-2/+16
| | | | | | | | | | | | | | | | | | To enable windows xp support, we must do two things: 1. linker flag must be /SUBSYSTEM:CONSOLE,5.01 or /SUBSYSTEM:WINDOWS,5.01. For x64, the version is 5.02. 2. Do not use Windows Kit 8. Win SDK v7.1A is recommended. Prepend the right include paths and lib paths to INCLUDE and LIB before building. The Windows XP target support is enabled by passing "-target xp" to configure. Task-number: QTBUG-29939 Change-Id: I84c8439606cc2a9d27d64947702846faa4f1e4a2 Reviewed-by: Lucas Wang <wbsecg1@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix win32 mkspecsOswald Buddenhagen2014-03-061-2/+4
| | | | | | | | | | | Instead of checking for dynamicgl in QT_CONFIG, which is apparently not possible, revert them and do it in opengl.prf instead. Dynamic GL is Windows-only for the time being so this should be sufficient. Change-Id: If293ea4c9b024df52257086c8b6250602a44724d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* qmake: Provide feature for windeployqtAndrew Knight2014-02-111-0/+19
| | | | | | | | | | | | | | windeployqt is a tool that aids in the deployment of Qt libraries and other files on Windows. This feature (CONFIG+=windeployqt) adds automatic invocation of windeployqt for qmake projects as a post-link action. For Visual Studio projects, windeployqt is added as a custom target which runs after linking, automatically adding the output as deployment items. Task-number: QTBUG-35630 Change-Id: I4cdcb1a7f70cedccb4a4e17be5eb9f5de35a4d66 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-01-171-1/+1
| | | | | | | | Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 20:49:00 +0000