summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32
Commit message (Collapse)AuthorAgeFilesLines
* Fixed win32-msvc2008 build regression.axis2011-01-312-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
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3116-20/+31
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1716-16/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1016-16/+16
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | qmake: fix wrong case label in toString(subSystemOption)Joerg Bornemann2011-01-101-4/+0
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | qmake: write and install pkg-config files for mingwMark Brand2011-01-102-0/+15
| | | | | | | | | | | | | | | Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Made qmake strip trailing \ from libdirs.axis2011-01-281-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-01-283-9/+19
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
* | | Added support for various special compiler/linker flags on MinGW.axis2011-01-281-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-01-281-3/+11
| | | | | | | | | | | | RevBy: Trust me
* | | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-01-282-3/+4
| | | | | | | | | | | | RevBy: Trust me
* | | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-01-281-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-01-281-8/+38
| | | | | | | | | | | | RevBy: Oswald Buddenhagen
* | | Added Symbian makefile building support using MinGW backend.axis2011-01-281-2/+2
|/ / | | | | | | RevBy: Oswald Buddenhagen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-8/+24
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Fix QTBUG-13928 non flat mode for project files in VS2010.Martin Petersson2010-11-251-7/+24
| | | | | | | | | | Reviewed-by: Joerg Task-number: QTBUG-13928
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-251-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix performance penalty in Win32MakefileGenerator::findHighestVersion Allow QDial to wrap value when wrapping property is set. QtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by khansen)
| * | fix performance penalty in Win32MakefileGenerator::findHighestVersionJoerg Bornemann2010-11-251-2/+8
| | | | | | | | | | | | | | | | | | | | | Don't scan Qt's lib dir over and over again. Task-number: QTBUG-15595 Reviewed-by: ossi
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-251-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (102 commits) fix inf loop bug Enable the no-undefined flag on the linker for icc Fixed tst_qwidget::winIdChangeEvent Prevent compilers optimizing eval timebomb code out of existence. Fix incorrect example for Qt.rgba() Flickable and MouseArea were too eager to take/keep mouse grab. Allow javascript date and regexp objects in WorkerScript messages Fix compliation of ALSA audio backend when checking for surround support. Avoid lockup in ListView when animating delegates. Fix asynchronous reload call in test, broken by previous submit Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Update QtGui emulator def file for bug QT-3971 Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Ignore .pc/ Ensure WebView press delay timer is cancelled when grab is taken. Prevent crash when calling reload() from within a .qml Doc: Fixing typo ...
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | * Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-191-3/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-15393 Reviewed-by: axis
* | | qmake/MinGW: do not copy .pdb files on "make install"Sean Harmer2010-11-254-18/+41
|/ / | | | | | | | | | | | | | | | | | | | | Simply refactoring pdb part into the nmake generator at this stage. Some work is being repeated from the base class implementation. Will get it working first then see if I can refactor to remove the redundancy. Task-number: QTBUG-14236 Merge-request: 2506 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * qmake vcxproj generator: fix description of custom build toolsJoerg Bornemann2010-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | The description of custom build tools that handle more than one extra compiler cannot be separated by ampersands in Visual Studio 2010. This seems to be a msbuild bug. We'll just circumvent this issue by changing the separator in the description to comma. Task-number: QTBUG-13986 Reviewed-by: ossi
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-5/+5
|\ \ | |/
| * Fixed many spelling errors.Rohan McGovern2010-10-252-5/+5
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Revert "qmake: pass include directories to MS resource compiler"Joerg Bornemann2010-10-133-4/+1
| | | | | | | | | | | | | | | | This reverts commit cd4eaa9c8274559aa2b0ceaeed1644966b9a2d94. We need a better plan to handle the command-line-is-too-long case. Reviewed-by: ossi
| * qmake: delete .pdb file when making 'distclean' instead of 'clean'Joerg Bornemann2010-10-111-1/+1
| | | | | | | | | | | | | | | | In Visual Studio builds "nmake clean" will now keep the .pdb files. Calling "nmake distclean" will delete them. Task-number: QTBUG-13853 Reviewed-by: ossi
| * qmake: pass include directories to MS resource compilerJoerg Bornemann2010-10-113-1/+4
| | | | | | | | | | Task-number: QTBUG-13776 Reviewed-by: ossi
* | Add manual test for mkspecs to visualize the effect of the final configTor Arne Vestbø2010-10-131-0/+1
| | | | | | | | Reviewed-by: ossi
* | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DEPLOYMENT instruction uses .sources, while INSTALLS uses .files. This is inconsistent, and we fix it in Qt 4 by adding .files as a supported alternative for DEPLOYMENT. This commit will be followed by a second, which aligns Qt build system. For Qt 5, this needs to be cleaned up by removing support for .sources. Task-number: QTBUG-3216 Reviewed-by: João Abecasis Cherry-picked from 730a5d562fcb7be6428458962456033054f99e4c by Frans Englich. Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-076-83/+43
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * fix regexp in "make custom command handling in vc(x)proj files sane"Oswald Buddenhagen2010-10-061-1/+1
| |
| * make QMAKE_POST_LINK handling in nmake generator saneOswald Buddenhagen2010-10-051-4/+1
| | | | | | | | | | | | | | | | there is no point in &&-ing it with a possibly present signature command - putting it on a line of its own works just fine - with the added benefit of not breaking if it contains operators itself. Reviewed-by: mariusSO
| * make custom command handling in vc(x)proj files saneOswald Buddenhagen2010-10-057-89/+50
| | | | | | | | | | | | | | | | | | | | instead of glueing the commands with "&&" and having a monster hack (\r\h) for the case where they cannot be and-ed, glue them with newlines and error checks. this ensures that we a) never have excessively long lines, b) don't need the monster hack and c) commands always have proper error checks, just like in makefiles. Reviewed-by: mariusSO
* | qmake: introduction of QMAKE_PROJECT_NAMEJoerg Bornemann2010-09-212-3/+8
| | | | | | | | | | | | | | | | With this variable one can set the project name for IDE project files. Currently only used for Visual Studio Task-number: QTBUG-3206 Reviewed-by: ossi
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-302-4/+8
|\ \ | |/ | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-263-3/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Autotest: don't use Q_FUNC_INFO for testing which method got called fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog Restore default if to system default on session close. tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result ...
| | * qmake vc[x]proj generators: support /MAP option without file nameJoerg Bornemann2010-08-242-2/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-13081 Reviewed-by: Martin Petersson
| | * qmake vcxproj generator: fix bug when using CharacterSet=1 in .pro fileJoerg Bornemann2010-08-241-1/+0
| | | | | | | | | | | | | | | Task-number: QTBUG-13080 Reviewed-by: Martin Petersson
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-3/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| | * qmake: fix assertion on Windows when DESTDIR is empty in static libsJoerg Bornemann2010-08-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Basically replacing project->values("foo").first() with project->first("foo") which does a null check. Task-number: QTBUG-12851 Reviewed-by: ossi
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-4/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * | qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-12807 Reviewed-by: TrustMe
| * | qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | Don't add the PDB file name to ForcedIncludeFiles. Task-number: QTBUG-12802 Reviewed-by: TrustMe
| * | QMake/Win32/MinGW: Fix ar script generating with absolute pathsTuomas Suutari2010-08-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QMake decides to use absolute path for some object file, this code used to leave the ADDMOD command out from the ar object script, which resulted in following errors from the issued "ar -M" command: Syntax error in archive script, line 2 Syntax error in archive script, line 3 etc... And the build failed in the linking phase, because the generated static library was empty. Fix this issue by prepending the file name with ADDMOD command even if the file path is absolute. Task-number: QTBUG-12959 Merge-request: 2451 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | qmake vcproj generator cleanupJoerg Bornemann2010-08-101-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVCPROJ_CXXFLAGS removed. This was unused. MSVCPROJ_LFLAGS removed. This was used to convert the values of QMAKE_LFLAGS, QMAKE_LIBDIR and DEF_FILE to linker command line options. Then they were converted back to set values in the object model. This journey to the world of command line options isn't necessary... Reviewed-by: ossi
* | | qmake: repair .vcxproj generationJoerg Bornemann2010-08-103-15/+17
| | | | | | | | | | | | Rubber-stamped-by: ossi
* | | qmake: move .vcproj XML generation from data classes to VCProjectWriterJoerg Bornemann2010-08-102-203/+189
| | | | | | | | | | | | Rubber-stamped-by: ossi
generated by cgit v0.12 at 2025-03-09 16:42:29 (GMT)