From 995f81e7b09980b370975edaa50cb3cebf277b6e Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 21 Apr 2011 07:47:26 -0500 Subject: [PATCH] Use private headers --- modules/qt_activeqt.pri | 10 +++++----- src/activeqt/container/container.pro | 1 + src/activeqt/control/control.pro | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/qt_activeqt.pri b/modules/qt_activeqt.pri index e2f8132..0d1d687 100644 --- a/modules/qt_activeqt.pri +++ b/modules/qt_activeqt.pri @@ -1,12 +1,12 @@ -QT_DECLARATIVE_VERSION = $$QT_VERSION -QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION -QT_DECLARATIVE_MINOR_VERSION = $$QT_MINOR_VERSION -QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION +QT.activeqt.VERSION = 4.8.0 +QT.activeqt.MAJOR_VERSION = 4 +QT.activeqt.MINOR_VERSION = 8 +QT.activeqt.PATCH_VERSION = 0 QT.activeqt.name = ActiveQt QT.activeqt.bins = $$QT_MODULE_BIN_BASE QT.activeqt.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/ActiveQt -QT.activeqt.private_includes = $$QT_MODULE_INCLUDE_BASE/ActiveQt/private +QT.activeqt.private_includes = $$QT_MODULE_INCLUDE_BASE/ActiveQt/$$QT.activeqt.VERSION QT.activeqt.sources = $$QT_MODULE_BASE/src/activeqt QT.activeqt.libs = $$QT_MODULE_LIB_BASE QT.activeqt.plugins = $$QT_MODULE_PLUGIN_BASE diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index 57845b0..ce0b238 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -16,6 +16,7 @@ TARGET = QAxContainer INCLUDEPATH *= $$QT.activeqt.includes +QT += core-private gui-private CONFIG += qt warn_on staticlib DESTDIR = $$QT.activeqt.libs diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index 3f7af07..42b9d2f 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -16,6 +16,7 @@ TARGET = QAxServer INCLUDEPATH *= $$QT.activeqt.includes +QT += core-private gui-private CONFIG += qt warn_off staticlib DESTDIR = $$QT.activeqt.libs -- 1.7.5.rc2.4.g4d8b3