summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge branch 'buildsystem'" into refs/staging/masterOswald Buddenhagen2012-06-20176-2616/+2416
|\
| * Merge branch 'buildsystem'Oswald Buddenhagen2012-06-19176-2616/+2416
| |\
| | * Fixed Wince Makefile environmentBjoern Breitmeyer2012-06-197-6/+258
| | * make missing qt modules fatalOswald Buddenhagen2012-06-191-1/+3
| | * less confusing wordingOswald Buddenhagen2012-06-191-1/+1
| | * fix misnomer: qt_module.prf => qt_build_config.prfOswald Buddenhagen2012-06-1916-47/+49
| | * fix regexp in qmodule.pri inclusion checkOswald Buddenhagen2012-06-192-3/+1
| | * revamp automatic makefile generation for sub-projectsOswald Buddenhagen2012-06-194-33/+52
| | * support for private depends in modulesOswald Buddenhagen2012-06-193-1/+12
| | * introduce $$QMAKE_CHK_EXISTS_GLUEOswald Buddenhagen2012-06-194-7/+7
| | * centralize definitions of shell commandsOswald Buddenhagen2012-06-1966-622/+43
| | * normalize $$QMAKE_QMAKEOswald Buddenhagen2012-06-193-6/+4
| | * correctly find idc even for makefilesOswald Buddenhagen2012-06-191-1/+2
| | * fix in-/out-dir mixupOswald Buddenhagen2012-06-191-4/+4
| | * remove unnecessary conditionalOswald Buddenhagen2012-06-191-6/+2
| | * remove duplicate assignments of MKDIR & CHK_DIR_EXISTSOswald Buddenhagen2012-06-191-2/+0
| | * unobfuscate makefiles re $(CHK_DIR_EXISTS)Oswald Buddenhagen2012-06-192-1/+5
| | * make 'qmake_all' targets respect .depends and CONFIG+=orderedOswald Buddenhagen2012-06-191-0/+7
| | * make 'qmake_all' target of SUBDIRS projects properly recursiveOswald Buddenhagen2012-06-192-7/+21
| | * make 'qmake' target of SUBDIRS projects non-recursiveOswald Buddenhagen2012-06-192-7/+1
| | * don't use $(MAKEFILE) to refer to SUBDIRS' makefilesOswald Buddenhagen2012-06-191-1/+1
| | * do not add "/." to _PRO_FILE_PWD_Oswald Buddenhagen2012-06-191-1/+1
| | * don't refer to removed headersOswald Buddenhagen2012-06-191-1/+0
| | * allow projects to suppress qmake recursionOswald Buddenhagen2012-06-191-0/+2
| | * scan module path backwardsOswald Buddenhagen2012-06-191-0/+1
| | * let default_pre add modules to the qmake pathOswald Buddenhagen2012-06-192-17/+3
| | * recognize QMAKEMODULES env var, property and cache variableOswald Buddenhagen2012-06-191-2/+8
| | * look for mkspecs/ even below .qmake.cache/.conf-determined rootOswald Buddenhagen2012-06-191-19/+26
| | * add support for a super cacheOswald Buddenhagen2012-06-192-13/+57
| | * look for .qmake.conf filesOswald Buddenhagen2012-06-193-19/+33
| | * find .qmake.cache for subprojects independentlyOswald Buddenhagen2012-06-193-41/+52
| | * allow setting QMAKEPATH and QMAKEFEATURES in .qmake.cacheOswald Buddenhagen2012-06-191-0/+24
| | * don't duplicate project_build_root's calculation needlesslyOswald Buddenhagen2012-06-191-7/+2
| | * move generation of module master headers to qt_module_headersOswald Buddenhagen2012-06-193-90/+30
| | * make master phonon compat header a forwarding headerOswald Buddenhagen2012-06-191-1/+6
| | * remove detection-based usage of modules which are frameworksOswald Buddenhagen2012-06-191-11/+0
| | * fix direct includes from modules which are frameworksOswald Buddenhagen2012-06-191-1/+1
| | * let modules which are frameworks remember that factOswald Buddenhagen2012-06-191-0/+2
| | * remove workarounds for broken syncqtOswald Buddenhagen2012-06-192-10/+0
| | * automatically add QT_BUILD_FOO_LIB to DEFINESOswald Buddenhagen2012-06-1914-15/+14
| | * remove backwards compatibility hacksOswald Buddenhagen2012-06-192-14/+0
| | * clean up projects from QPRO_PWD nonsense, etc.Oswald Buddenhagen2012-06-1912-14/+1
| | * auto-generate QMAKE_PKGCONFIG_REQUIRES and QMAKE_PKGCONFIG_DESCRIPTIONOswald Buddenhagen2012-06-1911-24/+6
| | * move QMAKE_PKGCONFIG_VARIABLES stuff out of qt_module_config.prfOswald Buddenhagen2012-06-193-24/+32
| | * remove ACTIVEQT_IDC assignment from QMAKE_IDCOswald Buddenhagen2012-06-191-1/+0
| | * remove support for CONFIG+=qt_compatOswald Buddenhagen2012-06-191-6/+0
| | * don't explicitly inject qt header/library pathsOswald Buddenhagen2012-06-191-6/+0
| | * always add library path from moduleOswald Buddenhagen2012-06-191-3/+3
| | * make module includepath addition less convolutedOswald Buddenhagen2012-06-191-12/+11
| | * add qtCompileTest()Oswald Buddenhagen2012-06-191-0/+90