lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-07 04:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

qtquick1 now depends on qttools, not the other way round

Browse Source 
This depends on https://codereview.qt-project.org/#change,28044
and https://codereview.qt-project.org/#change,28047

Change-Id: I1587b0c4b8f3d3b25acf6106aedf0824270da98d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Lars Knoll
2012-06-02 14:11:08 +02:00
committed by Qt by Nokia
parent fd18c7da23
commit 93310ed069
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.dependencies
View File

@@ -24,12 +24,12 @@ use Config;
"qtphonon" => "qtbase",
"qtpim" => "qtdeclarative,qtjsondb:s",
"qtqa" => "qtbase",
"qtquick1" => "qtbase,qtscript,qtxmlpatterns,qtsvg:s",
"qtquick1" => "qtbase,qtscript,qtxmlpatterns,qttools,qtsvg:s",
"qtscript" => "qtbase",
"qtsensors" => "qtbase,qtdeclarative",
"qtsvg" => "qtbase",
"qtsystems" => "qtbase,qtdeclarative,qtjsondb:s",
"qttools" => "qtbase,qtscript,qtdeclarative,qtquick1,qtwebkit:s",
"qttools" => "qtbase,qtdeclarative,qtwebkit:s",
"qttranslations" => "qttools",
"qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
"qtwebkit-examples-and-demos" => "qtwebkit",

10
qt.pro
View File

@@ -42,7 +42,7 @@ module_qtwebkit_examples_and_demos.depends = module_qtwebkit
module_qttools.subdir = qttools
module_qttools.target = module-qttools
module_qttools.depends = module_qtbase module_qtquick1 module_qtdeclarative
module_qttools.depends = module_qtbase module_qtdeclarative
module_qttranslations.subdir = qttranslations
module_qttranslations.target = module-qttranslations
@@ -116,7 +116,7 @@ module_qtimageformats.depends = module_qtbase
module_qtquick1.subdir = qtquick1
module_qtquick1.target = module-qtquick1
module_qtquick1.depends = module_qtbase module_qtscript
module_qtquick1.depends = module_qtbase module_qtscript module_qtxmlpatterns
module_qtgraphicaleffects.subdir = qtgraphicaleffects
module_qtgraphicaleffects.target = module-qtgraphicaleffects
@@ -181,7 +181,11 @@ exists(qtactiveqt/qtactiveqt.pro) {
SUBDIRS += module_qtactiveqt
module_qttools.depends += module_qtactiveqt
}
exists(qttools/qttools.pro): SUBDIRS += module_qttools
exists(qttools/qttools.pro) {
SUBDIRS += module_qttools
# disable this for now to avoid a circula dependency quick1 -> tools -> webkit -> quick1
# module_qtquick1.depends += module_qttools
}
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects