Mercurial > projects > qtd
changeset 44:3cb15c92ac28
CMake: small cleanup.
generator: Rename 'package-depends' to 'depend'.
| author | SokoL_SD |
|---|---|
| date | Sun, 17 May 2009 16:49:10 +0000 |
| parents | bfc76a437a62 |
| children | 71b382c10ef6 |
| files | CMakeLists.txt generator/typesystem.cpp generator/typesystem_gui.xml generator/typesystem_opengl.xml |
| diffstat | 4 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Sun May 17 16:41:44 2009 +0000 +++ b/CMakeLists.txt Sun May 17 16:49:10 2009 +0000 @@ -63,7 +63,6 @@ get_filename_component(dc_parent_dir ${dc_path} NAME) if("${dc_parent_dir}" STREQUAL "bin") get_filename_component(dc_path ${dc_path} PATH) - messagE(${dc_path}) endif("${dc_parent_dir}" STREQUAL "bin") set(CMAKE_INSTALL_PREFIX ${dc_path} CACHE PATH "QtD install prefix" FORCE
--- a/generator/typesystem.cpp Sun May 17 16:41:44 2009 +0000 +++ b/generator/typesystem.cpp Sun May 17 16:49:10 2009 +0000 @@ -183,7 +183,7 @@ tagNames["add-class"] = StackElement::AddClass; tagNames["store-result"] = StackElement::StoreResult; - tagNames["package-depend"] = StackElement::PackageDepend; + tagNames["depend"] = StackElement::PackageDepend; } bool startElement(const QString &namespaceURI, const QString &localName,
--- a/generator/typesystem_gui.xml Sun May 17 16:41:44 2009 +0000 +++ b/generator/typesystem_gui.xml Sun May 17 16:49:10 2009 +0000 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <typesystem package="qt.gui" default-superclass="QtDObject"> -<package-depend package="qt.core" /> +<depend package="qt.core" /> <inject-code> qt.Utilities.loadQtLibrary("QtGui"); </inject-code>
--- a/generator/typesystem_opengl.xml Sun May 17 16:41:44 2009 +0000 +++ b/generator/typesystem_opengl.xml Sun May 17 16:49:10 2009 +0000 @@ -2,8 +2,8 @@ <?xml-stylesheet type="text/xsl" href="merge.xsl"?> <typesystem package="qt.opengl" default-superclass="QtDObject"> -<package-depend package="qt.core" /> -<package-depend package="qt.gui" /> +<depend package="qt.core" /> +<depend package="qt.gui" /> <inject-code> qt.Utilities.loadQtLibrary("QtGui"); qt.Utilities.loadQtLibrary("QtOpenGL");