summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-166-30/+105
|\ | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * Add experimental support for armCC on LinuxHarald Fernengel2011-02-111-1/+3
| | | | | | | | Reviewed by our Anttis
| * 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-3142-249/+281
| |\
| * \ Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-285-27/+105
| |\ \
| | * | 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-282-3/+5
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| * | | Added Symbian deployment localization for makefile build system.axis2011-01-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-24/+33
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
| * | | Fix generated mif file cleaning in symbian-abldMiikka Heikkinen2011-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mif file cleaning was incorrectly done at distclean phase. Task-number: QTBUG-16893 Reviewed-by: axis
| * | | No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-273-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no fundamental reason to not have dash or dot in binary names in Symbian, so do not replace them with underscore. One thing that doesn't work with a dot in the filename is launching an application via resources, so automatic resource generation is suppressed for applications that have a dot in filename portion of the TARGET value. Task-number: QTBUG-16888 Reviewed-by: axis
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-261-1/+1
|\ \ \ \ | |/ / /
| * | | Fix QMAKE_POST_LINK in Symbian for targets with special characters.Miikka Heikkinen2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proper fixed targets was not used to generate the dependency for QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen before actual linking. Task-number: QTBUG-16881 Reviewed-by: axis
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-252-25/+40
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * | | Fixed UTF-8 application names in device application menu in SymbianMiikka Heikkinen2011-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHARACTER_SET UTF8 statement was missing from generated .rss file, causing localized application names containing UTF-8 characters to be rendered incorrectly. Task-number: QT-4476 Reviewed-by: axis
| * | | Improved QMAKE_POST_LINK support in symbian-sbsv2Miikka Heikkinen2011-01-201-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMAKE_POST_LINK value handling now uses the same automatic replacements as QMAKE_EXTRA_COMPILERS and QMAKE_EXTRA_TARGETS handling. In practice this means that it is now possible to use $$QMAKE_COPY and friends in QMAKE_POST_LINK value also with symbian-sbsv2 mkspec, and that any backslashes in the value are assumed to be path separators and will be converted to forward slashes. Task-number: QTBUG-16753 Reviewed-by: Janne Koskinen
| * | | Remove toolcheck from generic clean targets for symbian-sbsv2Miikka Heikkinen2011-01-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toolcheck can cause generic clean fail (i.e. "make clean" or "make debug-clean") for e.g. environments where Carbide command line tools have not been installed, because sbsv2 toolchain does a check for all tools related to target platforms, even though they are not needed for actual cleaning. Task-number: QTBUG-16691 Reviewed-by: Janne Koskinen
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1742-42/+42
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1042-42/+42
| | | | | | | | | | | | | | | | 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>
* | | | qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-104-182/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pkg-config related methods from unix generator to base class so they can be used by other generators too. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | qmake: fix double directory separatorMark Brand2011-01-101-2/+7
| |/ / |/| | | | | | | | | | | Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-052-0/+50
|\ \ \ | |/ /
| * | Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
| | | | | | | | | | | | | | | | | | | | | Make it possible to freeze def files via makefile targets. Task-number: QTBUG-13769 Reviewed-by: Janne Koskinen
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * Fix infinite loop in qmake when reading malformed .ts files.Miikka Heikkinen2010-12-221-1/+1
| | | | | | | | | | | | | | | | No checking for the end of xml file was done in while loop looking for TS element. Task-number: QTBUG-16261 Reviewed-by: Janne Koskinen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-062-9/+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
| * Remove unused variableMiikka Heikkinen2010-11-261-1/+0
| | | | | | | | | | | | | | Variable currentClause is no longer used for anything, so removed its declaration. Reviewed-by: TrustMe
| * Fix QTBUG-13928 non flat mode for project files in VS2010.Martin Petersson2010-11-251-7/+24
| | | | | | | | | | Reviewed-by: Joerg Task-number: QTBUG-13928
* | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-021-2/+2
| | | | | | | | | | | | | | Starting from Qt 4.8, ".files" is the correct variable suffix to use for declaring deployment files. Reviewed-by: Janne Koskinen
* | 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-259-274/+368
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-259-274/+368
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Use parent class function to generate Makefile headers in SymbianMiikka Heikkinen2010-11-232-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Creator depends on some of the information generated into the makefile header by MakefileGenerator::writeHeader() function, so changed symmake*.cpp to use it instead of each having separate code for header generation. Task-number: QTBUG-15539 Reviewed-by: Janne Koskinen
| | * Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-196-22/+22
| | | | | | | | | | | | | | | Task-number: QTBUG-15393 Reviewed-by: axis
| | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-181-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-127-233/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila 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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-091-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Doc: Fixing typo Doc: Fixing typo Fixed tst_qwidget::testContentsPropagation auto-test failure. Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
generated by cgit v0.12 at 2024-11-14 19:48:09 (GMT)