2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-18 01:52:17 +00:00
Commit Graph

40 Commits

Author SHA1 Message Date
Jürgen Hunold
c4708afdfd Add support for QtMultimedia framework in upcoming Qt-4.6.
[SVN r56132]
2009-09-10 10:14:46 +00:00
Jürgen Hunold
79234159d1 Refactoring: Rename uic-h to uic to get uniform toolnames.
[SVN r51313]
2009-02-18 19:11:49 +00:00
Jürgen Hunold
daaa7260f1 Add support for QtScriptTools (Qt-4.5)
[SVN r51300]
2009-02-17 19:30:19 +00:00
Jürgen Hunold
48f0248cc1 Fix: Correct handling of include paths with spaces.
[SVN r51275]
2009-02-16 19:35:15 +00:00
Jürgen Hunold
4380274a30 Major refactoring of Qt4 toolchain featuring:
- support for multiple 'using qt' statements.
- auto-detection of Qt version using qmake.
- support for user-specified version.
- better debug messages.
- support for toolset requirements.


[SVN r51230]
2009-02-12 20:38:33 +00:00
Jürgen Hunold
544c50a044 Refactoring of library declaration in qt4.jam.
Simplyfied declaration of Qt component libraries.
Removed duplicated code.
Add test cases for most of the Qt component libraries.


[SVN r47391]
2008-07-13 18:40:02 +00:00
Jürgen Hunold
07f1712c16 Make all libraries "explicit". Workaround for missing "configure" support.
[SVN r45664]
2008-05-22 19:06:32 +00:00
Jürgen Hunold
486fe604fd Add support for additional Qt-4.4 libraries
[SVN r45663]
2008-05-22 19:02:10 +00:00
Vladimir Prus
73770d23c2 Allow to separately specify include, lib and bin paths for Qt4.
Patch from tr1gun <tr1gun@gmx.net>


[SVN r45143]
2008-05-05 15:24:56 +00:00
Jurko Gospodnetić
4a70266395 Removed a TODO comment related to the 'NOTFILE all ;' statement in tools/build/v2/build-system.jam and replace with a better explanation comment. Dead code removal, Comment typo corrections. Minor stylistic changes.
[SVN r45072]
2008-05-03 16:32:23 +00:00
Jurko Gospodnetić
275b25072d Minor stylistic changes - cleaned up import calls, wrapped much text at 80 characters updated comments, typo corrections, removed trailing spaces, etc.
[SVN r42497]
2008-01-05 20:37:44 +00:00
Jürgen Hunold
a3eb1741f5 Add dependency scanner for Qt Resource Files (.qrc).
[SVN r41908]
2007-12-08 20:08:29 +00:00
Jürgen Hunold
5acea4be23 Add support for QtScript library.
[SVN r41907]
2007-12-08 20:02:33 +00:00
Jürgen Hunold
9cde1825a8 Fix: remove <user-interface>gui from usage-requirements of QtGui.
Rationale: <user-interface>gui merely disables console output window on <target-os>windows.
But users often need console debug output when running Gui apps.


[SVN r40898]
2007-11-07 18:06:31 +00:00
Jürgen Hunold
219d35992e Prepare for separate include, library and binary prefixes for preinstalled Qt.
[SVN r36864]
2007-01-31 19:45:54 +00:00
Jürgen Hunold
1787e35156 Fix: enable "_debug" suffix for OSX again.
[SVN r35820]
2006-11-03 07:54:52 +00:00
Jürgen Hunold
1e5ec85587 Upgrade to Qt-4.2:
- Add support for QtDBus library.
- Adjust to changes in Qt's build system: No parallel build of debug and release libraries on Unix anymore.
- Remove explicit "<variant>release" requirements for release builds, enabling custom build variants.


[SVN r35809]
2006-11-02 15:15:07 +00:00
Jürgen Hunold
806868ce2e Fix: Remove suffix_version for QtUiTools.
[SVN r35575]
2006-10-12 14:13:38 +00:00
Jürgen Hunold
fc137a52e3 Add missing QtDesigner library.
Improve control of Qt3Support library.


[SVN r35266]
2006-09-21 20:05:26 +00:00
Jürgen Hunold
21085a5086 Fix include path for QtAssistantClient library.
[SVN r35218]
2006-09-19 19:40:03 +00:00
Jürgen Hunold
c083c0104d Correct QSql to QtSql in dependency list of Qt3Support.
[SVN r33735]
2006-04-18 18:57:02 +00:00
Jürgen Hunold
2cda71032b Add QtOpenGL to the list of buildable modules.
[SVN r33728]
2006-04-17 20:59:54 +00:00
Vladimir Prus
742901b437 Support using Qt3 and Qt4 at the same time.
[SVN r33627]
2006-04-10 09:40:41 +00:00
Vladimir Prus
538aec0607 Make Qt4 module work in "import qt4; using qt4 : ....." scenario.
Add method 'initialized'.


[SVN r33588]
2006-04-07 11:28:45 +00:00
Vladimir Prus
8b2442f6ef Add Juergen's copyright, with his permission.
[SVN r33587]
2006-04-07 11:19:47 +00:00
Vladimir Prus
936ed4700e New library QtUiTools. Support buildable Qt tree.
Patch from Juergen Hunold.


[SVN r33580]
2006-04-07 07:45:07 +00:00
Vladimir Prus
213a53acb8 Use project name 'qt' for Qt4 and 'qt3' for Qt3.
[SVN r33442]
2006-03-22 15:10:27 +00:00
Vladimir Prus
ab9b0a29df Don't support QTDIR for Qt4, as Qt4 itself deprecates this environment
variable.


[SVN r33436]
2006-03-22 10:09:18 +00:00
Vladimir Prus
cd2cd5b6f0 "Unmess" Qt3Support.
Patch from Juergen Hunold.


[SVN r32605]
2006-02-06 12:50:22 +00:00
Vladimir Prus
67ff0ed2a5 Improved Qt4 support.
1. Better qmake compatibility by adding the necessary defines for each
Qt library. E.g. qmake defines QT_CORE_LIB when generating makefiles
for a project using QtCore, QT_GUI_LIB for QtGui and so on.
2. Added support for QtTestLib, the Qt Test Framework ( Qt 4.1)
3. Added support for QtAssistantClient, Qt Integrated Help System
4. Better readability by adding explicit comments (# usage-requirements)
and having one line per setting).
5. Add support for "moc-and-include header" by
5a. duplication of the "moccable-cpp" hack for headers.
5b. copy&change of "moc-h-generator" to "moc-inc-generator"
5c. renaming of the "moc.cpp" action  to "moc.inc" and rearringing
documentation.

Patch from Juergen Hunold.


[SVN r32428]
2006-01-27 09:02:18 +00:00
Vladimir Prus
3bf9c02507 Fix UI files in libraries for Qt4.
[SVN r31830]
2005-11-30 11:18:19 +00:00
Vladimir Prus
69af5e0b9a Unbreak libraries using Qt, together with moccable classes in .cpp files.
The generator that handles moccable cpp files has to actualize created
targets right away. However, it did that before calling
virtual-target.register, so, if the generator was invoked two times on
the same target, it will produce two identical targets and call .actualize
on it. The second invocation would trigger "duplicate target" error.


[SVN r31797]
2005-11-28 09:26:41 +00:00
Vladimir Prus
d5dd6a8057 Qt 4 fixes.
- correct registration of "qt4.moc.cpp" in line 86.
- add <threading>multi to the usage-requierements because qt4 is
_always_ and can only be built with multithreading enabled.
http://doc.trolltech.com/4.1/qt4-network.html#comparison-with-qt-3
- changes the declaration order of the libraries and corrects the
dependencies.
- add support for the new QtSvg SVG-Rendering library (Qt 4.1)
- fix -I vs. -D in moc rules.

Patch from Juergen Hunold.


[SVN r31673]
2005-11-16 10:06:51 +00:00
Vladimir Prus
ec673c840f Add the "ui_" prefix to the header the uic generates, to match
qmake's behaviour.

Thanks to Ryan Winter for the hint.


[SVN r31033]
2005-09-19 07:48:36 +00:00
Vladimir Prus
2a159020c6 Make it possible to run moc on CPP sources.
[SVN r30942]
2005-09-13 10:16:37 +00:00
Vladimir Prus
4086ae176c Factor out Qt types declaration into separate file. Now Qt3 and Qt4 can
be both initialized.


[SVN r30772]
2005-09-01 10:36:16 +00:00
Vladimir Prus
087232f4e7 Pass the <include> and <define> feature to the Qt4's moc tool.
Patch from Jurgen Hunold.


[SVN r30771]
2005-09-01 10:26:14 +00:00
Vladimir Prus
4320c23297 For Qt4, don't run moc on headers produces by uic, since they
never contains moccable classes.

The trick here is that if we have:

  exe a : a.cpp b.ui ;

Then we should produce b.h target that is not used by any action -- it's
only indirectly used by include in a.cpp.

So, we declared .ui -> .obj generator, so that it's invoked when
building exe, but make it return header, not .obj.

Second, the path of b.h should be added to include paths. But it was
not done, because b.h is not used anywhere and so is not included in
'subvariant' for this target -- which object is used to compute extra
incude path.

* build/virtual-target.jam
  (register): Add result to .recent-targets
  (recent-targets, clear-recent-targets): New functions.

* build/targets.jam
  (basic-target.generate): Create subvariant from
  'virtual-target.recent-targets' not just directly returned targets.

* tools/qt4.jam: Declare custom generator for ui->h conversion.


[SVN r30770]
2005-09-01 10:22:52 +00:00
Vladimir Prus
3ba458a38d Qt4 improvements:
- Add -name option to rcc invocation. This is needed to disambiguate
  the name of the generated initialising function. Since qmake takes
  the basename of  the  .qrc file I've copied this behaviour to have
  consistent naming.

- Add -I option to moc invocation. I've added the include and
  include/QtCore directories in order to be able to compile Qt4 with V2.

Patch from Juergen Hunold.


[SVN r30536]
2005-08-12 10:26:36 +00:00
Vladimir Prus
b0627925df Qt4 support, from Alo Sarv.
[SVN r30360]
2005-08-01 14:08:27 +00:00