summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Liang Qi [Thu, 25 Nov 2010 12:39:10 +0000 (13:39 +0100)]
Remove the hardcode QT_CONFIG in those pri files.
Marius Storm-Olsen [Wed, 24 Nov 2010 19:21:56 +0000 (13:21 -0600)]
Make modules compile without hardcoded paths
Marius Storm-Olsen [Thu, 25 Nov 2010 04:20:01 +0000 (22:20 -0600)]
Make qt.prf use new qt_module.pri structure for QT variable
This change requires the new resolve_depends(var, prefix) function in qmake.
Marius Storm-Olsen [Wed, 24 Nov 2010 17:51:57 +0000 (11:51 -0600)]
Add resolve_depends(var, prefix) function to qmake
This function calculates the topological order of variables.
We will use it to determine which and in what order to link
module libraries.
The function is not tied to libraries/modules only, but requires
the variables to be ordered to have their dependencies in the
[prefix]<var>.depends subvariable.
Due to the recursive nature of the algorithm it was just much easier
to implement it directly in C++ rather than in a qmake-language
function.
Marius Storm-Olsen [Thu, 25 Nov 2010 02:21:06 +0000 (20:21 -0600)]
Add module specific pris, and make syncqt create fwd includes
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.
Marius Storm-Olsen [Thu, 25 Nov 2010 01:56:41 +0000 (19:56 -0600)]
Have qmake run syncqt automatically, if sync.profile is detected
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.
Marius Storm-Olsen [Thu, 25 Nov 2010 01:51:35 +0000 (19:51 -0600)]
Fixup: not paths for other modules
axis [Tue, 16 Nov 2010 13:31:27 +0000 (14:31 +0100)]
Moved symbianpkgrules profiles to be feature profiles.
Marius Storm-Olsen [Mon, 15 Nov 2010 19:55:17 +0000 (13:55 -0600)]
Make syncqt use sync.profile files from each module
The sync.profile replaces the hardcoded paths inside syncqt, and
enables it to work for other modules than just qtbase.
Liang Qi [Mon, 15 Nov 2010 15:43:22 +0000 (16:43 +0100)]
Expose private support for separate module in syncqt.
Marius Storm-Olsen [Thu, 11 Nov 2010 15:35:09 +0000 (09:35 -0600)]
Expose source and build directories for QtBase
Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
Marius Storm-Olsen [Tue, 9 Nov 2010 02:09:10 +0000 (20:09 -0600)]
Some changes for qtbase
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.
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