Mercurial > projects > qtd
changeset 225:f7dca08fc816
fix for macosx
author | eldar |
---|---|
date | Thu, 16 Jul 2009 21:39:21 +0000 |
parents | 7f150ad4cb5f |
children | f31b783b3bb9 |
files | CMakeLists.txt build/gui.makefile build/gui.txt generator/typesystem_gui-java.java generator/typesystem_gui.xml |
diffstat | 5 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Jul 15 17:16:36 2009 +0000 +++ b/CMakeLists.txt Thu Jul 16 21:39:21 2009 +0000 @@ -306,7 +306,7 @@ endif(NOT GENERATE_DI_FILES) ## Link CPP library. - add_library(cpp_${package} SHARED ${cpp_sources}) + add_library(cpp_${package} STATIC ${cpp_sources}) set_property(TARGET cpp_${package} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles) if(CMAKE_HOST_WIN32 AND D_IS_MARS) ## TODO: Replace by SEPAREATE_CPP_PART else(CMAKE_HOST_WIN32 AND D_IS_MARS)
--- a/build/gui.makefile Wed Jul 15 17:16:36 2009 +0000 +++ b/build/gui.makefile Thu Jul 16 21:39:21 2009 +0000 @@ -362,5 +362,4 @@ QShortcut \ QSizeGrip \ QSortFilterProxyModel \ -QSound \ -UrlHandler \ No newline at end of file +QSound \ No newline at end of file
--- a/build/gui.txt Wed Jul 15 17:16:36 2009 +0000 +++ b/build/gui.txt Thu Jul 16 21:39:21 2009 +0000 @@ -1,6 +1,6 @@ set(required Core) set (cpp_files qt_gui/UrlHandler_shell) -set (d_files gui/UrlHandler) +#set (d_files gui/UrlHandler) set(classes QPushButton QFileIconProvider
--- a/generator/typesystem_gui-java.java Wed Jul 15 17:16:36 2009 +0000 +++ b/generator/typesystem_gui-java.java Thu Jul 16 21:39:21 2009 +0000 @@ -588,7 +588,7 @@ }// class class QDesktopServices___ extends QDesktopServices { - +/* private static UrlHandler[string] __rcUrlHandlers; public static void setUrlHandler(string scheme, void delegate(QUrl) dg) { UrlHandler receiver = dg !is null ? new UrlHandler(dg) : null; @@ -599,7 +599,7 @@ __rcUrlHandlers[scheme] = receiver; setUrlHandler(scheme, receiver, "handleUrl"); - } + }*/ }// class class QWizardPage___ extends QWizardPage {
--- a/generator/typesystem_gui.xml Wed Jul 15 17:16:36 2009 +0000 +++ b/generator/typesystem_gui.xml Thu Jul 16 21:39:21 2009 +0000 @@ -2847,9 +2847,9 @@ </object-type> <object-type name="QDateEdit"/> <object-type name="QDesktopServices"> - <extra-includes> +<!-- <extra-includes> <include file-name="qt.gui.UrlHandler" location="java"/> - </extra-includes> + </extra-includes>--> <modify-function signature="setUrlHandler(const QString &, QObject *, const char *)" access="private"> <modify-argument index="2"> <reference-count action="ignore"/> <!-- Handled in injected code -->