summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-034-3/+7
|\
| * Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-08-021-0/+1
| * Add rudimentary config.test support when configuring modules.Michael Goddard2011-07-221-1/+1
| * Make sure we qtPrepareTool moc, uic and rcc tooMarius Storm-Olsen2011-07-211-0/+3
| * Fix non-installed library detectionMarius Storm-Olsen2011-07-211-1/+1
| * Make sure we only run syncqt for the non-buildpass casesMarius Storm-Olsen2011-07-211-1/+1
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-121-1/+1
|\ \ | |/
| * fix misnomer: $$resolve_depends() => $$sort_depends()Oswald Buddenhagen2011-07-111-1/+1
| * make 1st argument of $$resolve_depends a variableOswald Buddenhagen2011-07-111-1/+1
* | remove generated filesLars Knoll2011-07-0713-110/+0
* | Merge remote branch 'gerrit/master' into refactorLars Knoll2011-07-0616-3/+113
|\ \ | |/
| * Build Qt with option -Zc:wchar_t under MSVCliang jian2011-06-273-3/+3
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-271-5/+13
|\ \ | |/
| * Support -debug build on MacLiang Qi2011-06-201-1/+1
| * Ensure we pass -developer-build to syncqt for -nokia-developer buildsMarius Storm-Olsen2011-06-111-5/+13
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-107-20/+315
|\ \ | |/
| * Complain if we don't load(qt_module) firstMarius Storm-Olsen2011-06-082-4/+19
| * Fix typo from 1835afe6Marius Storm-Olsen2011-06-081-1/+1
| * Make qmake slightly more verbose with its syncqt output.axis2011-06-061-3/+5
| * Moved common module profiles to be feature profiles.axis2011-06-053-0/+274
| * Implemented module-local caching of module profiles.axis2011-06-032-7/+11
| * Don't base QTDIR detection on .qmake.cache.axis2011-06-031-7/+0
| * Changes needed for Qt to accept module .qmake.cache files.axis2011-06-031-3/+8
* | QtPlatformSupport: A helper library for platform pluginsJørgen Lind2011-06-1017-231/+8
* | Make building of platform plugins indifferent if its out of sourceJørgen Lind2011-06-0615-0/+231
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-015-21/+51
|\ \ | |/
| * Made qpluginbase.pri into a feature profile.axis2011-05-311-0/+41
| * Fixed linking against QtQuickTest on mac.Charles Yin2011-05-311-15/+1
| * Only add dependent include when not already thereMarius Storm-Olsen2011-05-271-1/+1
| * Add QtTools' include/QtDesigner as well as QtCore's include/QtDesignerMarius Storm-Olsen2011-05-261-4/+3
| * Do not continue if syncqt fails.Lincoln Ramsay2011-05-251-1/+5
* | Merge remote branch 'staging/master' into refactorPaul Olav Tvete2011-05-24121-2107/+2132
|\ \ | |/
| * Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-24146-2571/+2571
| * add qmltestcase.prf for QtQuickTestCharles Yin2011-05-211-0/+25
* | Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-201-0/+4
|\ \ | |/
| * tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-05-191-0/+4
* | Make Cocoa the default platform plugin on Mac.Morten Sorvig2011-05-201-0/+2
* | Remove QMAKE_MACOS_DEPLOYMENT_TARGET.Morten Sorvig2011-05-191-1/+0
* | No -rpath-link on Mac.Morten Sorvig2011-05-111-1/+1
* | Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-115-74/+95
|\ \ | |/
| * Massively update the hurd-g++ mkspec.Pino Toscano2011-05-101-72/+56
| * Add enablers for Symbian App BoosterSimon Frost2011-05-102-0/+33
| * Fix "make sis" for projects that have empty OBJECTS_DIRMiikka Heikkinen2011-05-101-1/+5
| * Fix framework absolute path issueJiang Jiang2011-05-041-1/+1
* | Merge remote branch 'origin/master' into refactorLars Knoll2011-05-046-9/+49
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-046-9/+46
| |\
| | * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-024-8/+38
| | * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-021-0/+7
| | * Make sure we don't always pull in modules from installed mkspecsMarius Storm-Olsen2011-05-021-1/+1
| * | QT += declarative implies += opengl too, so hardcode it to make stuff workGunnar Sletta2011-04-281-0/+3
| |/