From d1d26eaf4d13220b460cbc3a69dd9fafb8c12e1a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 25 Nov 2010 15:20:01 +0100 Subject: Make declarative compile. --- src/declarative/declarative.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index b74b18c090..fdbb07072a 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,3 +1,5 @@ +load(qt_module) + TARGET = QtDeclarative QPRO_PWD = $$PWD QT = core gui script network @@ -13,7 +15,7 @@ exists("qdeclarative_enable_gcov") { LIBS += -lgcov } -include(../qbase.pri) +include($$QT_SOURCE_TREE/src/qbase.pri) #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET #DESTDIR=. @@ -39,5 +41,5 @@ symbian: { linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND DEFINES += QT_NO_OPENTYPE -INCLUDEPATH += ../3rdparty/harfbuzz/src +INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src -- cgit v1.2.3 From 587dcbbdac5384205b9489b0ee9aa8d9d7340421 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 11 Jan 2011 11:09:56 +0100 Subject: compile qtdeclarative/import --- src/imports/qimportbase.pri | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 0f70030dac..b0d2181786 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -1,4 +1,6 @@ -symbian:include(../plugins/qpluginbase.pri) +load(qt_module) + +symbian:include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) TEMPLATE = lib CONFIG += qt plugin @@ -25,7 +27,7 @@ QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -include(../qt_targets.pri) +include($$QT_SOURCE_TREE/src/qt_targets.pri) wince*:LIBS += $$QMAKE_LIBS_GUI -- cgit v1.2.3 From 74d634606d80045c90a80de285cf4a731dc06fb4 Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 17 Mar 2011 10:58:42 +0100 Subject: Switched to using QT.declaratice.imports variable. --- src/imports/folderlistmodel/folderlistmodel.pro | 2 +- src/imports/gestures/gestures.pro | 2 +- src/imports/particles/particles.pro | 2 +- src/imports/qimportbase.pri | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 44764a91a2..e55a5b2a29 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -7,7 +7,7 @@ QT += declarative script SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp HEADERS += qdeclarativefolderlistmodel.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index ad872bae3f..8ebf9a02f8 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -7,7 +7,7 @@ QT += declarative SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 90b50e4659..ba570f77a3 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -11,7 +11,7 @@ SOURCES += \ HEADERS += \ qdeclarativeparticles_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index b0d2181786..8647f05cb9 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -15,7 +15,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir +copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} -- cgit v1.2.3 From bd8b4936c2fa4c01c61821018b394b6468c0a597 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 22 Mar 2011 13:20:53 +0100 Subject: Introduced the QT..plugins variable to module profiles. --- src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index e8ab962da8..25f05c205a 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -3,7 +3,7 @@ QT += declarative network include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling +DESTDIR = $$QT.declarative.plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" SOURCES += \ -- cgit v1.2.3 From e59d2b9adc8aafffd94d51ad29de7a9035256e87 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Wed, 23 Mar 2011 10:55:02 +0100 Subject: Changed the path for qpluginbase.pri --- src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index 25f05c205a..14113fb072 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,7 +1,7 @@ TARGET = qmldbg_tcp QT += declarative network -include(../../qpluginbase.pri) +include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) DESTDIR = $$QT.declarative.plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" -- cgit v1.2.3