Commit Graph

7 Commits

Author SHA1 Message Date
Oswald Buddenhagen 44cdbfa489 remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf.

Change-Id: Id53efb418c1d545c4c90280f54b3824ae8261e49
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-17 14:07:14 +01:00
Oswald Buddenhagen 3edf2e19dc centralize and fixup example sources install targets
follow respective change in qtbase

Change-Id: I6bbcefcad264191dac51d52cd335de776ae3bfe5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-03 11:44:31 +01:00
Joerg Bornemann 27a802f198 fix activeqt module structure
The formerly monolithic ActiveQt module has been split into three
modules:

axserver
    A static library for creating a server project.
axcontainer
    A static libary for creating a container project.
axbase
    A static library with shared code for the latter two libraries.
    This module also is responsible for the installation of header
    files in the include/ActiveQt directory.

"CONFIG += qaxserver" has been deprecated.
Use "QT += axserver" instead.

"CONFIG += qaxcontainer" has been deprecated.
Use "QT += axcontainer" instead.

Code from qaxtypes.cpp that does not depend on the QAX_SERVER define
has been moved to qaxtypefunctions.cpp and resides in the axbase
module.

Task-number: QTBUG-27776
Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2012-11-28 08:56:19 +01:00
Miikka Heikkinen 26ebb99a49 Fix installation of ActiveQt examples
Active Qt examples cannot have dependencies to sources because not
all installations have sources available. Each example that needs them
now has its own copy of .rc, .def, and .ico files to make them
self-contained.

Task-number: QTBUG-26848
Change-Id: I1ce919dd393ff372ef12c5db268f9f08022fa3f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-22 16:26:15 +02:00
Friedemann Kleint 53ca8a7a66 Fix compilation after refactor merge.
Comment out Some functionality for the moment.

Change-Id: Ia7d1d3ba982e97776ae7259be06689b5477450a1
Reviewed-on: http://codereview.qt-project.org/5972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-10-04 11:16:34 +02:00
axis 9b235560ba Changed references to ActiveQt resources. 2011-04-27 12:05:56 +02:00
Qt by Nokia 41c8d3db37 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