Commit Graph

29 Commits

Author SHA1 Message Date
Oswald Buddenhagen
b175e7b7c9 remove support for syncqt-based config tests
now that all modules have migrated, dispose of the clutter.

Change-Id: Ib8937c1452536f645b76c0097b927df1108afc1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-12 17:18:36 +02:00
Casper van Donderen
4569ba9d3b Fix installation of syncqt.
- Use the syncqt from the source dir, not build dir.
- Copy both syncqt and syncqt.bat on win32.

Change-Id: Ic07805d03124386fb112c154e22363a06ae1c8ec
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 20:11:46 +02:00
Oswald Buddenhagen
13c99ee2f5 windows hosts of course also need exclusion from mkspecs_pre
Change-Id: I90de625b1b521977a4dc1cd499eb6ece02d837f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-06 00:37:39 +02:00
Oswald Buddenhagen
918fd56324 centralize handling of QT_BUILD_PARTS
Change-Id: I33b8c3958a102d87461ad887fa5749bd9a6dc037
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-07-05 21:11:27 +02:00
Oswald Buddenhagen
1b4087ae0c remove special handling of the default{,-host} specs
cp is perfectly capable of properly copying the symlinks

Change-Id: Ia45a4521af2ffb70af4e111480c0d6b7999c96c1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-07-03 16:48:33 +02:00
Rohan McGovern
f3d59d3c9c Restore building of examples, tests.
Without this, a simple "configure && make" will not build the examples
or tests, even if the "-make tests -make examples" options were used.

This is a partial revert of 709cc8800e.

Change-Id: If363cd24d30ba4c102a35ed2617999ae4e9ed9b0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-06-22 05:21:52 +02:00
Oswald Buddenhagen
c7bf0448da detach src/src.pro and src/tools/tools.pro from qtbase.pro
they were included instead of being proper subdirs. this doesn't appear
to be necessary for anything at this point.

Change-Id: Ie57285df8e5ea7bd8883bcd42fa6ed62b8e1d54d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 16:39:21 +02:00
Oswald Buddenhagen
709cc8800e make makefile generation under unix sane
we now simply call qmake -r, which is also what we do under windows.
-fast mode is retained for examples and tests, though with moderately
modified semantics (i couldn't be bothered to decipher what the old ones
were supposed to be).

Change-Id: Id2c2d2bed9c8d52ac42f31b388bffc34f4649650
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 16:37:50 +02:00
Oswald Buddenhagen
14bbab09c1 introduce ability to build projects for the host system
when qmake runs into the new option(host_build) command, it will restart
the project evaluation with a host spec.

the new default host spec is called default-host (gasp!). it is
overridden with the pre-exising -spec / -platform option, while the new
-xspec / -xplatform option overrides the pre-existing default spec.
specifying -spec but not -xspec will set the xspec, too, so the behavior
is backwards-compatible. same for the XQMAKESPEC override read from
.qmake.cache and the environment variable.
the cleaner solution would be adding -hostspec, to be symmetrical with
the override semantics, but that would deviate from configure in turn.

Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 16:37:49 +02:00
Donald Carr
698e5b376d Remove all references to X11 session management
There is no session management currently implemented for the xcb QPA
backend. Update the build system to reflect this.

Change-Id: I3486de5741f1fb7e09330ca142b8235a84d3b91d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-01 03:15:55 +02:00
Girish Ramakrishnan
84e98fd9d2 device: Add -device and -device-option to configure
For some reference platforms and SDKs we will need to pass in
extra paths. Currently users have to modify the mkspec to adjust
paths or set environment variables that will be picked up.

This change introduces the -device <name> and -device-option
<key=value> option. The key value pairs will be written to a
qdevice.pri and can be used by the qmake.conf of the device spec.

The reason to not save the key value pairs in qconfig.pri is
becase of the fact that the device spec loads the qdevice.pri
earlier than the qconfig.pri. qdevice.pri allows the mkspec
to set the compiler flags and qconfig.pri allows configure to
add to those compiler flags.

Done-with: Holger Freyther

Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Donald Carr <donald.carr@nokia.com>
2012-03-27 05:35:57 +02:00
Oswald Buddenhagen
deea66c9f4 remove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREE
Change-Id: I77cf734b58f350d82277c084a680ab56fdf82f08
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-08 18:57:13 +01:00
Girish Ramakrishnan
aee8f7d81e Remove references to missing tests
17ddce4692 removed the endian test.
90a5492fb0 removed the ipv6 test.

largefile and nix are long dead.

Change-Id: If8e5d4f0546e30778b82ee99f662cb9ed3aefacb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-07 18:43:41 +01:00
Oswald Buddenhagen
012f799254 revamp -sysroot and -hostprefix handling
instead of being a variable added to the makespec (via qconfig.pri),
QT_SYSROOT is now a property.

the QT_INSTALL_... properties are now automatically prefixed with the
sysroot; the raw values are available as QT_RAW_INSTALL_... - this is
expected to cause the least migration effort for existing projects.

-hostprefix and the new -hostbindir & -hostdatadir now feed the new
QT_HOST_... properties.

adapted the qmake feature files and the qtbase build system accordingly.

Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-01 23:18:23 +01:00
Bradley T. Hughes
b113644acb Add configure, sync.profile, and header.* to OTHER_FILES in qtbase.pro
This makes these files easily locatable when using Qt Creator.

Change-Id: Ie0c15ebf2cc7045954713265bf524f2ecf1eea34
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-02-08 07:40:03 +01:00
Xizhi Zhu
ba9302b8a9 Remove Symbian specific code from qtbase.
Change-Id: I27d37d914b71e1e43c94e2a975ffec49e1ecd456
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-01-31 07:08:31 +01:00
aavit
48f9ba388b Remove support for the MNG file format and the bundled libmng
The MNG file format is generally abandoned, and libmng has been
unmaintained for several years.

The MNG plugin and bundled libmng has been moved to the
qtimageformats project on Gerrit.

Task-number: QTBUG-21869
Change-Id: I946432347014ffde2b72307a5f8b166ca5553602
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-25 02:22:18 +01:00
Rohan McGovern
a25d0ef3c2 Ensure qmodule.pri is installed.
From the commit message of 0b2ce85200 and
the code in qt_module.prf, it is apparently intended that qmodule.pri is
installed, but this was never implemented correctly.  Make sure we
install it.

This has gone unnoticed because it happens to be installed by accident
unless $$QT_SOURCE_TREE != $$QT_BUILD_TREE and
$$QT_BUILD_TREE != $$[QT_INSTALL_PREFIX] (i.e. a shadow build which is
not using -developer-build).

Change-Id: Iee861a7bb592ca43a61ad91f1ef6a7a5bd21aff8
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-23 00:12:03 +01:00
Anders Bakken
8b60708044 Fix make confclean
Merge-request: 1227
Reviewed-by: ossi

(cherry-picked from commit 792b4b500ab740f89db5586791105ff13778b87f)

Change-Id: Id5ec2cfb228691c8483bf1d9e0c6a763aa649217
Reviewed-on: http://codereview.qt-project.org/4570
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-12 16:03:47 +02:00
Michael Goddard
2dc77d9264 Try to make sure the config test script is installed.
And try to fail a bit more gracefully if it isn't.

Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221
Reviewed-on: http://codereview.qt.nokia.com/2109
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-07-26 13:40:07 +02:00
Casper van Donderen
1fab62b930 Remove all references to demos.
Remove the references to demos from configure and qtbase.pro.
This is done because of the merge of the demos and examples in Qt.
Everything will be added as an example.

Change-Id: Iec040f5c719384c7aabba971316de40195ed3a69
Reviewed-on: http://codereview.qt.nokia.com/619
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-06-23 14:03:31 +02:00
Rohan McGovern
c1e372a5a3 Fixed ordering problem when configuring with `-make <part>'
Prior to this change, running configure with the `-make' option would
affect the order in which parts of Qt are built.  This is unintuitive
and would easily cause build failures.  For example, configuring with
`./configure -make demos' would attempt to build demos before building
libs, which, of course, would fail.

Refactor the code so that the result is the same regardless of the order
of `-make' options.

Change-Id: Idfa61834a0f01d0628a9a1ae27ece94ae3647e6d
Reviewed-on: http://codereview.qt.nokia.com/128
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-05-26 11:09:32 +02:00
Lincoln Ramsay
b4b100fb8f Fix -nomake tests.
It now means "don't run qmake", not just "don't build".
This is consistent with -nomake demos and -nomake examples

Reviewed-by: Rohan Mcgovern
2011-05-25 12:40:25 +10:00
Rohan McGovern
a1e66dbeaa tests: enable compilation of autotests for qtbase by default
Tests are now treated like examples and demos: compiled by default,
unless you configured with `-nomake tests'.  (They are still not
installed by default, however.)

Reviewed-by: Jason McDonald
Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
2011-05-11 11:52:24 +10:00
Marius Storm-Olsen
2e8b6dcb4a Install syncqt, and ensure it runs fine for external modules 2011-05-02 15:30:08 +02:00
axis
bd025379c8 Fixed "make check" target for qtbase.
It was caused by a missing "tests" target.
2011-04-27 12:06:00 +02:00
Marius Storm-Olsen
d383f9f8bc Build examples and demos in qtbase 2011-04-27 12:05:59 +02:00
Marius Storm-Olsen
f6d0b71700 Some changes for qtbase 2011-04-27 12:05:44 +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