summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Fix wrong merge of 3aa39b0164ce4bb9eOlivier Goffart2011-04-191-1/+1
|
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-187-56/+83
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * look for makespec in the build dir firstOswald Buddenhagen2011-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | it's more natural to look into the build dir before the source dir, and it's what the qmake-generated makefiles mean when re-invoking qmake. specifically, this works around the problem that relative paths with excess ".."s pointing below the root are happily ignored and thus truly bizarre makespec paths may be constructed by the qmake re-invocations if the source dir is less nested than the build dir. Task-number: QTBUG-9817 Reviewed-by: mariusSO
| * make collection of SUBDIRS in solution generator less bizarreOswald Buddenhagen2011-04-122-21/+22
| | | | | | | | | | | | | | de-duplicate code, and on the way don't try to re-resolve project variables of subprojects against the contents of the top level project. Reviewed-by: mariusSO
| * run depend_command in build dir in VS generators as wellOswald Buddenhagen2011-04-124-4/+18
| | | | | | | | | | | | followup to b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61 Reviewed-by: mariusSO
| * fixify target source against build treeOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | | | | | | | | | that's where one would expect a target, after all. affects only extra targets explicitly requesting fixification, i.e., nothing. Reviewed-by: mariusSO
| * fix fixifying of QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-6/+10
| | | | | | | | | | | | | | use the correct bases. notably, don't expect the input file in the output dir. Reviewed-by: mariusSO
| * dist target: fixify OBJECTS_DIR against output dirOswald Buddenhagen2011-04-121-1/+2
| | | | | | | | | | | | the thing is terminally broken anyway, but whatever Reviewed-by: mariusSO
| * fix paths of vpath-resolved filesOswald Buddenhagen2011-04-121-4/+3
| | | | | | | | | | Task-number: QTBUG-8169 Reviewed-by: mariusSO
| * simplify: absolute fixification ignores the base dir argumentsOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * simplify: fileFixify for all same paths is always "."Oswald Buddenhagen2011-04-121-3/+1
| | | | | | | | | | | | this must have been the most arcane way to generate a single dot ever Reviewed-by: mariusSO
| * simplify: the input and output dirs are already normalizedOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * stop fixifying after first successOswald Buddenhagen2011-04-121-0/+1
| | | | | | | | | | | | | | somewhat unlikely that this had much real-world effects ... except eating yet more cpu. Reviewed-by: mariusSO
| * create a pwd string with a trailing slash only on demandOswald Buddenhagen2011-04-121-6/+7
| | | | | | | | Reviewed-by: mariusSO
| * useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-123-1/+16
| | | | | | | | Reviewed-by: mariusSO
| * prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"Oswald Buddenhagen2011-04-121-7/+7
| | | | | | | | | | | | | | that way prf files don't have to check both the prefix and the actual template to identify visual studio mode. Reviewed-by: mariusSO
* | Merge earth-team into origin/master'Olivier Goffart2011-04-128-7/+29
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-085-4/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add support for -unset <prop> option to qmake.
| | * | Add support for -unset <prop> option to qmake.Darryl L. Miles2011-04-085-4/+26
| | | | | | | | | | | | | | | | | | | | Merge-request: 1175 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-073-3/+3
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows 7, kernel32.dll exports many of the same functions as advapi32.dll. If executables link to these functions in kernel32.dll instead of advapi32.dll, running these executables on older versions of Windows will cause an entry point error. This would occur due to kernel32 being specified before advapi32. To resolve this issue, advapi32 is specified before kernel32 when linking. Task-number: QTBUG-18537 Merge-request: 1169 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-072-4/+11
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-053-5/+5
| |\ \
| * | | Fix emulator deployment for items with "!:" drive.Miikka Heikkinen2011-03-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "!:" drive is used to indicate need to prompt user to specify installation drive, which is obviously not happening when we do the build time emulator deployment, so default it to "c:" drive. Task-number: QTBUG-18134 Reviewed-by: Janne Koskinen
| * | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-1610-69/+59
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | | | Removed broken "deploy.path" support from SymbianMiikka Heikkinen2011-03-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The undocumented special "deploy.path" variable hasn't been working in Symbian for several releases and doesn't really make much sense in Symbian in the first place. Also, apparently no-one has ever used it as there has been no bug reports, so might as well remove the check for it in Symbian. Task-number: QTBUG-14426 Reviewed-by: Janne Koskinen
| * | | | Strip echo suppression character "@" from commands in symbian-sbsv2Miikka Heikkinen2011-03-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian-sbsv2 toolchain cannot handle echo suppresion character "@" in recipes, so the character is stripped from all commands if it exists at the beginning of the command. Task-number: QTBUG-4767 Reviewed-by: Iain
* | | | | Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-281-1/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def 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_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| | * | | remove redundand validateModes() callOswald Buddenhagen2011-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | i added another one a few lines above ...
| | * | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-145-29/+102
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | * | | Fixed win32-msvc2008 build regression.axis2011-03-042-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
| | | * | | Made qmake strip trailing \ from libdirs.axis2011-03-041-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-03-043-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * | | Added support for various special compiler/linker flags on MinGW.axis2011-03-041-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-03-041-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-03-042-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-03-041-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-03-041-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * | | Added Symbian makefile building support using MinGW backend.axis2011-03-042-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * | | Added Symbian deployment localization for makefile build system.axis2011-03-041-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 'earth-team/master-i18n' into 4.8-earthDenis Dzyubenko2011-03-244-2/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/tools.pri
| * \ \ \ \ \ Merge remote branch 'earth-team/master' into master-i18nDenis Dzyubenko2011-03-1711-98/+79
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale.cpp
| * | | | | | | Split monolithic qlocale.cpp into platform-specific filesDenis Dzyubenko2011-02-244-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a refactoring change to split huge unreadable qlocale.cpp into multiple files. Reviewed-by: Zeno Albisser
* | | | | | | | ReplaceExtraCompilerCacheKey: Don't recreate "::" QString on each call.Andreas Kling2011-03-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
* | | | | | | | qmake vcxproj generator: fix non flat projects for VS2010Martin Petersson2011-03-221-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filters for files in the non flat projects will start with the base filter name and then the path to the file. So the detection of the filter needs to be done by the start of the filter namse so that we correctly add the compile commands for the added files. Task-number: QTBUG-13928 Reviewed-by: Joerg Bornemann
* | | | | | | | Merge remote-tracking branch 'origin/master'Olivier Goffart2011-03-2119-93/+619
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | 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 ...
generated by cgit v0.12 at 2025-01-20 16:57:11 (GMT)