summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-246-104/+104
| |_|/ |/| | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-22/+22
|\ \ \ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Fix a bug in syncqt.
| * | | Fix a bug in syncqt.Liang Qi2011-05-111-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the generation of version header file before the sync of header files. Reviewed-by: TrustMe
* | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-0/+40
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Add QT_xxx_VERSION macros for each library in qtbase
| * | Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-101-0/+40
| |/ | | | | | | | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* | Improve logic to find default certificates in createpackage scriptMiikka Heikkinen2011-05-101-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original implementation assumed createpackage script was always run from under Qt source tree bin directory, which is not always the case as on some platforms the Qt tools can be found from under EPOCROOT. Fixed it so that if the default directory for default certificates can't be found in the expected location, createpackage will attempt to query qmake in the same directory as the createpackage script for the location of the Qt source tree (QT_INSTALL_PREFIX) and look for default certificates directory from under there. Task-number: QTBUG-18684 Reviewed-by: Janne Koskinen (cherry picked from commit 01477af79d8114b3f8993c3967892538a599dfa6)
* | Fixed detection of QtBase directory.axis2011-05-101-3/+3
|/ | | | | | | | The old check would fail for an installed copy of Qt. Instead, base the check on using QTDIR if it present, otherwise use the parent of the bin directory, and then check that "mkspecs" is present. Reviewed-by: Olivier Goffart
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-1/+21
| | | | | | | 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.
* Install syncqt, and ensure it runs fine for external modulesMarius Storm-Olsen2011-05-021-2/+6
|
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-271-0/+1
|
* Fixed syncqt generation of bin path.axis2011-04-271-1/+1
| | | | | | Now it points to QtBase's bin directory, in the case of developer builds. This makes it easier to develop modules together without having to install them first.
* Added QT.<module>.imports support to module profiles.axis2011-04-271-0/+1
|
* Load the sync.profile after setting the variables.Prasanth Ullattil2011-04-271-9/+10
|
* Temporarily pointing QT_MODULE_LIB_BASE to qtbase/libPrasanth Ullattil2011-04-271-1/+1
| | | | | This has to changed when we start to generate the module binaries in their respective lib/bin folders.
* Made sure syncqt gets called correctly even if it is not in the PATH.axis2011-04-271-2/+4
|
* Make each module refer to its own bin/Marius Storm-Olsen2011-04-271-0/+1
| | | | | | | 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 syncqt collapse redundant ".." sections in paths.axis2011-04-271-0/+2
|
* Fixed useless substitution in syncqt.axis2011-04-271-1/+0
| | | | | The substitution is not necessary and messes up the argument that is passed in.
* Add hardcoded qclass_lib_map.h based on 4.8Marius Storm-Olsen2011-04-271-1/+1
| | | | This is only until UIC/Designer handles this properly
* Add the source path to the modules .pri fileMarius Storm-Olsen2011-04-271-0/+1
|
* Add module specific pris, and make syncqt create fwd includesMarius Storm-Olsen2011-04-271-3/+56
| | | | | | | | | | | | | | | | | | | | | | | 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.
* Make syncqt use sync.profile files from each moduleMarius Storm-Olsen2011-04-271-79/+84
| | | | | The sync.profile replaces the hardcoded paths inside syncqt, and enables it to work for other modules than just qtbase.
* Expose private support for separate module in syncqt.Liang Qi2011-04-271-1/+4
|
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-16/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2713-0/+2728
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