summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Massively update the hurd-g++ mkspec.Pino Toscano2011-05-101-72/+56
| | | | | | | | | | | | Bring it to the same level as linux-g++: - copy the defines from common/linux.conf - use the common gcc/g++ .conf files - keep the trick of linking the pthread library everywhere - leave out the wayland variables, which are not useful for Hurd Merge-request: 1219 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 027605f67f73c8021c1ae604adad298599785a79)
* Add enablers for Symbian App BoosterSimon Frost2011-05-102-0/+33
| | | | | | | | | | | | | To use the Symbian App Booster, a registration file (matching the filename of the executable, eg helloworld.applite) must be copied to the import folder within QtAppBooster's private directory. The appropriate library (qdeclarativebooster) must also be linked against. With this change, the required actions are carried out by adding "CONFIG += symbian_appbooster" to the application's .pro file. Task-number: QT-4892 Reviewed-by: Miikka Heikkinen (cherry picked from commit ae128aef03d246c9f89bed015092b1c5a925bcbc)
* Fix "make sis" for projects that have empty OBJECTS_DIRMiikka Heikkinen2011-05-101-1/+5
| | | | | | | | Temp directory for packagaging got created to system root if OBJECTS_DIR was empty. Fixed it to use '.' instead in those cases. Reviewed-by: Janne Koskinen (cherry picked from commit 930db5826ff2c02d54f2851494000c5fab97da54)
* Fix framework absolute path issueJiang Jiang2011-05-041-1/+1
| | | | | | | module.prf incorrectly overwrites INSTALLS which results the absolute soname not prepended. Reviewed-by: Marius Storm-Olsen
* 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
| | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
| * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-021-0/+7
| | | | | | | | Output warning if not present
| * Make sure we don't always pull in modules from installed mkspecsMarius Storm-Olsen2011-05-021-1/+1
| | | | | | | | | | | | | | | | | | When building Qt, qmake should not pull in mkspecs from an installed version, as this will lead to incorrect paths for the current build. So, here we ensure only to pull in modules from there we detected the qconfig.pri, and ensure we still handle the QMAKEPATH case used by some.
* | QT += declarative implies += opengl too, so hardcode it to make stuff workGunnar Sletta2011-04-281-0/+3
|/
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-271-0/+1
|
* Added QT.<module>.imports support to module profiles.axis2011-04-271-0/+1
|
* Properly detect qmodule.priMarius Storm-Olsen2011-04-271-4/+6
|
* Made sure syncqt gets called correctly even if it is not in the PATH.axis2011-04-271-1/+2
|
* Changed path references to ActiveQt.axis2011-04-272-0/+7
|
* Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.Prasanth Ullattil2011-04-271-2/+2
|
* Use the 'install_name' linker flag on Mac for the frameworks.Prasanth Ullattil2011-04-271-0/+5
| | | | This is required for the frameworks outside the qtbase module.
* Fixed wrong inclusion of QtHelp module.axis2011-04-271-2/+1
|
* Fixed a bug in libdir handling.axis2011-04-271-1/+2
| | | | | We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because MSVC does not understand -L.
* Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when neededMarius Storm-Olsen2011-04-271-0/+5
|
* Make each module refer to its own bin/Marius Storm-Olsen2011-04-272-3/+7
| | | | | | | Since modules cannot rely on QtCore having a build directory, nor can they build the applications directly into $$[QT_INSTALL_BINS] each module needs their own bin/. Add this path to each module's pri file, so others can use their applications
* Made modules that depend on other modules add their include paths.Marius Storm-Olsen2011-04-271-0/+6
| | | | | | | | This is needed so that header files which contain references to those modules (for example in templates) will have their include paths as well. RevBy: axis
* Corrected include path for UiTools.axis2011-04-271-1/+1
|
* Make qt.prf use new qt_module.pri structure for QT variableMarius Storm-Olsen2011-04-272-71/+79
| | | | This change requires the new resolve_depends(var, prefix) function in qmake.
* Add module specific pris, and make syncqt create fwd includesMarius Storm-Olsen2011-04-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | The module specific pris define the modules name version dependencies include paths lib paths additional CONFIGs and DEFINES They are located in the modules source directory, with fwd includes created in QtBase/mkspecs/modules build directory. The pris use QT_MODULE_INCLUDE_BASE QT_MODULE_LIB_BASE to specify the locations for includes and libs. These paths are normally based on QT_INSTALL_HEADERS QT_INSTALL_LIBS for installed modules, but overridden to the module's build directory by syncqt for the fwd included pris. The path of the pris must be specified in the sync.profile for syncqt to create the fwding pris in QtBase.
* Have qmake run syncqt automatically, if sync.profile is detectedMarius Storm-Olsen2011-04-271-0/+28
| | | | | | | This will normally only happen for top-level pro files, and syncqt is smart enough to not touch already existing files. And in edition, syncqt uses the original file's timestamp on the fwding files.
* Fixup: not paths for other modulesMarius Storm-Olsen2011-04-271-1/+1
|
* Moved symbianpkgrules profiles to be feature profiles.axis2011-04-272-0/+34
|
* Expose source and build directories for QtBaseMarius Storm-Olsen2011-04-271-0/+16
| | | | Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
* Initial import from the monolithic Qt.Qt by Nokia2011-04-27474-0/+22693
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 21:47:04 +0000