From 8017c9a69084ec492128b0511bc055fe2702cda7 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 21 Apr 2011 07:55:54 -0500 Subject: Use private headers --- modules/qt_declarative.pri | 10 +++++----- src/declarative/declarative.pro | 2 +- src/imports/gestures/gestures.pro | 2 +- src/imports/particles/particles.pro | 2 +- tools/qmlviewer/qml.pri | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index d4dfecd365..fe69b5f105 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.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.declarative.VERSION = 4.8.0 +QT.declarative.MAJOR_VERSION = 4 +QT.declarative.MINOR_VERSION = 8 +QT.declarative.PATCH_VERSION = 0 QT.declarative.name = QtDeclarative QT.declarative.bins = $$QT_MODULE_BIN_BASE QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative -QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private +QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/$$QT.declarative.VERSION QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index a54284fe6f..4c2e380540 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -6,7 +6,7 @@ QPRO_PWD = $$PWD CONFIG += module MODULE_PRI += ../../modules/qt_declarative.pri -QT = core gui script network +QT = core-private gui-private script-private network contains(QT_CONFIG, svg): QT += svg DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 8ebf9a02f8..7ecd4b8afa 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -2,7 +2,7 @@ TARGET = qmlgesturesplugin TARGETPATH = Qt/labs/gestures include(../qimportbase.pri) -QT += declarative +QT += core-private gui-private declarative-private script-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index ba570f77a3..5f39b08405 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -2,7 +2,7 @@ TARGET = qmlparticlesplugin TARGETPATH = Qt/labs/particles include(../qimportbase.pri) -QT += declarative +QT += core-private gui-private declarative-private SOURCES += \ qdeclarativeparticles.cpp \ diff --git a/tools/qmlviewer/qml.pri b/tools/qmlviewer/qml.pri index cfc74af89d..9ac5adc50e 100644 --- a/tools/qmlviewer/qml.pri +++ b/tools/qmlviewer/qml.pri @@ -1,4 +1,4 @@ -QT += declarative script network sql +QT += core-private gui-private declarative-private script network sql contains(QT_CONFIG, opengl) { QT += opengl DEFINES += GL_SUPPORTED -- cgit v1.2.3