diff options
Diffstat (limited to 'afterlive/qtdeclarative/0003-Use-private-headers.patch')
| -rw-r--r-- | afterlive/qtdeclarative/0003-Use-private-headers.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/afterlive/qtdeclarative/0003-Use-private-headers.patch b/afterlive/qtdeclarative/0003-Use-private-headers.patch new file mode 100644 index 0000000..0586fc7 --- /dev/null +++ b/afterlive/qtdeclarative/0003-Use-private-headers.patch @@ -0,0 +1,99 @@ +From f93c4322ae2a2be40e5ec9fb4253e1fd252389fb Mon Sep 17 00:00:00 2001 +From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> +Date: Thu, 21 Apr 2011 07:55:54 -0500 +Subject: [PATCH] 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 +- + src/plugins/qmltooling/tcpserver/tcpserver.pro | 2 +- + tools/qmlviewer/qml.pri | 2 +- + 6 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri +index d4dfecd..fe69b5f 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 a54284f..4c2e380 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 8ebf9a0..7ecd4b8a 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 ba570f7..5f39b08 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/src/plugins/qmltooling/tcpserver/tcpserver.pro b/src/plugins/qmltooling/tcpserver/tcpserver.pro +index 3789084..d4ce8be 100644 +--- a/src/plugins/qmltooling/tcpserver/tcpserver.pro ++++ b/src/plugins/qmltooling/tcpserver/tcpserver.pro +@@ -1,5 +1,5 @@ + TARGET = tcpserver +-QT += declarative network ++QT += declarative-private network + + include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) + +diff --git a/tools/qmlviewer/qml.pri b/tools/qmlviewer/qml.pri +index cfc74af..9ac5adc 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 +-- +1.7.5.rc2.4.g4d8b3 + |