summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* 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/Mac: replace @SHORT_VERSION@ in QMAKE_INFO_PLIST file not only for libsJoerg Bornemann2011-03-152-5/+15
| | | | | | | | | | | | | | | Task-number: QTBUG-7993 Reviewed-by: 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
* | | qmake vcproj generator: support PCHs with other extensions than .hJoerg Bornemann2011-03-152-2/+9
|/ / | | | | | | | | Task-number: QTBUG-16639 Reviewed-by: Marius Storm-Olsen
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-091-1/+4
| | | | | | | | | | | | | | | Task-number: QTPROD-875 Reviewed-by: Miikka Heikkinen
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-031-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is usedOswald Buddenhagen2011-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | don't insert an empty line between the command sets. this is needed for building sdk packages with breakpad support (which we want to do), so i'm defining it to be P1. Reviewed-by: mariusSO
* | | don't add extraneous empty command linesOswald Buddenhagen2011-03-011-1/+1
| | | | | | | | | | | | Reviewed-by: mariusSO
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-289-20/+560
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) fix autotest on windows (again) fix autotest on windows Ammend last INTEGRITY fix Fix qmake build on Windows fix test for QtLighthouse add test for suppressing warnings in moc Ammend INTEGRITY fixes Store property editor's column positions in settings add gsm to connectable bearer for networkmanager. Fix license headers add missing include Silence GHS compiler Run on INTEGRITY Fix compilation on INTEGRITY Do not link with libm on INTEGRITY Add a "-nn" option to moc Add Documentation about INTEGRITY RTOS List the INTEGRITY drivers as well Use TCP_LOCALSOCKET on INTEGRITY Compile for systems without mmap ...
| * | Ammend last INTEGRITY fixHarald Fernengel2011-02-243-3/+14
| | | | | | | | | | | | Also build gbuild.cpp on windows
| * | Fix qmake build on WindowsHarald Fernengel2011-02-243-3/+3
| | | | | | | | | | | | The INTEGRITY changes only modified the Unix makefile
| * | Fix license headersHarald Fernengel2011-02-222-46/+56
| | |
| * | Add support for the INTEGRITY RTOS build systemRolland Dudemaine2011-02-226-14/+533
| | | | | | | | | | | | | | | | | | | | | Adds mkspecs and a qmake generator for Green Hills .gpj files Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-0/+12
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-211-0/+12
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for QMAKE_CLEAN in symbian-sbsv2 Only add NetworkServices capability automatically if no caps are set.
| | * Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-211-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Files specified in QMAKE_CLEAN variable will now be properly cleaned in symbian-sbsv2 builds. Task-number: QTBUG-17004 Reviewed-by: Janne Koskinen
* | | 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-3153-300/+331
| |\ \ \
| * \ \ \ 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-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-5/+16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | | | | complain about unmatched quotes/parensOswald Buddenhagen2011-02-031-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using WarnDeprecated instead of WarnParser is a bit backwards, but we need something which is on by default and i don't feel like introducing a second parser warning mode for that. Reviewed-by: mariusSO
| * | | | | use const refOswald Buddenhagen2011-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| * | | | | move multiple inclusion check for feature files to correct locationOswald Buddenhagen2011-02-031-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, features specified with an absolute path would not be covered by the multiple inclusion guard, unlike the one specified just by a name. this is of theoretical value only, as nobody specifies features via absolute path anyway ... Reviewed-by: mariusSO
* | | | | 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
generated by cgit v0.12 at 2024-08-29 15:11:33 (GMT)