Commit Graph

1119 Commits

Author SHA1 Message Date
axis
afa1807c40 Added QT.<module>.imports support to module profiles. 2011-04-27 12:06:00 +02:00
Marius Storm-Olsen
2a5e47832b Properly detect qmodule.pri 2011-04-27 12:05:58 +02:00
axis
8e4fc361a5 Made sure syncqt gets called correctly even if it is not in the PATH. 2011-04-27 12:05:57 +02:00
axis
59db0a203d Changed path references to ActiveQt. 2011-04-27 12:05:56 +02:00
Prasanth Ullattil
b88c6fbcfe Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks. 2011-04-27 12:05:55 +02:00
Prasanth Ullattil
61126f4ae6 Use the 'install_name' linker flag on Mac for the frameworks.
This is required for the frameworks outside the qtbase module.
2011-04-27 12:05:55 +02:00
axis
346b3b0976 Fixed wrong inclusion of QtHelp module. 2011-04-27 12:05:54 +02:00
axis
a93039b229 Fixed a bug in libdir handling.
We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because
MSVC does not understand -L.
2011-04-27 12:05:54 +02:00
Marius Storm-Olsen
56ec511c6a Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed 2011-04-27 12:05:53 +02:00
Marius Storm-Olsen
82bf3bd775 Make each module refer to its own bin/
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
2011-04-27 12:05:51 +02:00
Marius Storm-Olsen
3ec5d96657 Made modules that depend on other modules add their include paths.
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
2011-04-27 12:05:51 +02:00
axis
fb9b30b610 Corrected include path for UiTools. 2011-04-27 12:05:50 +02:00
Marius Storm-Olsen
78797cc7e9 Make qt.prf use new qt_module.pri structure for QT variable
This change requires the new resolve_depends(var, prefix) function in qmake.
2011-04-27 12:05:46 +02:00
Marius Storm-Olsen
00c5f39081 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.
2011-04-27 12:05:46 +02:00
Marius Storm-Olsen
94e8d3b686 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.
2011-04-27 12:05:46 +02:00
Marius Storm-Olsen
81f7b862d6 Fixup: not paths for other modules 2011-04-27 12:05:46 +02:00
axis
32c4a26218 Moved symbianpkgrules profiles to be feature profiles. 2011-04-27 12:05:45 +02:00
Marius Storm-Olsen
a6fa179a23 Expose source and build directories for QtBase
Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
2011-04-27 12:05:45 +02:00
Qt by Nokia
38be0d1383 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
2011-04-27 12:05:43 +02:00