summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-30 08:50:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-03 10:34:05 +0100
commit7d4051d3bbc341574ca7a9bdf31d5f14306c1367 (patch)
tree127ff719bd6069da58bd9cba48fe1c6928b904dd
parent9f8b815752eb7bd8a0fcdb1a3989e9760222d35c (diff)
unmess library naming
the libraries all get a canonical "Qt" prefix. note that the common include dir stays ActiveQt. Task-number: QTBUG-27776 Change-Id: I80bc1ce8a88341a28d818a46f08d0f38f3c3fc4a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/activeqt/axshared.prx3
-rw-r--r--src/activeqt/container/container.pro2
-rw-r--r--src/activeqt/control/control.pro2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/activeqt/axshared.prx b/src/activeqt/axshared.prx
index 5c8273e..9b573f2 100644
--- a/src/activeqt/axshared.prx
+++ b/src/activeqt/axshared.prx
@@ -1,7 +1,8 @@
# This modules provides the header files, installed under "ActiveQt/".
# It also contains shared code that is used by axcontainer and axserver.
-TARGET = ActiveQt
+TARGET = QtAxBase
+MODULE_INCNAME = ActiveQt
CONFIG += static
QT += gui-private
diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro
index 9c9d5e2..f9fc53f 100644
--- a/src/activeqt/container/container.pro
+++ b/src/activeqt/container/container.pro
@@ -1,4 +1,4 @@
-TARGET = QAxContainer
+TARGET = QtAxContainer
QT += core-private gui gui-private widgets widgets-private axbase
CONFIG += static
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro
index 4bafbca..9107281 100644
--- a/src/activeqt/control/control.pro
+++ b/src/activeqt/control/control.pro
@@ -1,4 +1,4 @@
-TARGET = QAxServer
+TARGET = QtAxServer
QT += core-private gui-private widgets axbase
CONFIG += static