From 31e0f04386ddc0e5d532a8d7b99c3aaedf07e58c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=FCmmel?= Date: Tue, 22 Dec 2009 18:42:24 +0100 Subject: [PATCH] build with Qt 4.6.0 --- CMakeLists.txt | 6 +++--- generator/qt_internal.lua | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad32fd7..a1e54da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ set(QT_USE_QTSCRIPT 1) set(QT_USE_QTSVG 1) set(QT_USE_QTXML 1) #set(QT_USE_QTSQL 1) -#set(QT_USE_QTXMLPATTERNS 1) +set(QT_USE_QTXMLPATTERNS 1) include(${QT_USE_FILE}) if(noqt) @@ -225,11 +225,11 @@ else() build_qt_lib_binding(QtOpenGL QtGui QtNetwork QtCore) build_qt_lib_binding(QtSvg QtScript QtGui QtNetwork QtCore) build_qt_lib_binding(QtXml QtSvg QtScript QtGui QtNetwork QtCore) - build_qt_lib_binding(QtWebKit QtSvg QtScript QtOpenGL QtGui QtNetwork QtCore) + build_qt_lib_binding(QtXmlPatterns QtCore QtXml) + build_qt_lib_binding(QtWebKit QtXmlPatterns QtSvg QtScript QtOpenGL QtGui QtNetwork QtCore QtXml) # TODO #build_qt_lib_binding(QtSql) #build_qt_lib_binding(QtScriptTools) # 4.5 only - #build_qt_lib_binding(QtXmlPatterns) #build_qt_lib_binding(Phonon) endif() diff --git a/generator/qt_internal.lua b/generator/qt_internal.lua index 8d2d872..5adba6f 100644 --- a/generator/qt_internal.lua +++ b/generator/qt_internal.lua @@ -23,7 +23,22 @@ for c in pairs(classes) do or c.xarg.fullname=='QUpdateLaterEvent' -- compiles or c.xarg.fullname=='QTextStreamManipulator' -- compiles or c.xarg.fullname=='QtConcurrent::ThreadEngineSemaphore' -- compiles - + or c.xarg.fullname=='QTextObject' -- private/protected destcrutor + or c.xarg.fullname=='QTextCodec' -- private/protected destcrutor + or c.xarg.fullname=='QTextBlockGroup' -- private/protected destcrutor + or c.xarg.fullname=='QSessionManager' -- private/protected destcrutor + or c.xarg.fullname=='QAccessibleWidget' -- private/protected destcrutor + or c.xarg.fullname=='QAccessibleObjectEx' -- private/protected destcrutor + or c.xarg.fullname=='QClipboard' -- private/protected destcrutor + or c.xarg.fullname=='QAccessibleWidgetEx' -- private/protected destcrutor + or c.xarg.fullname=='QWebFrame' -- private/protected destcrutor + or c.xarg.fullname=='QWebHistory' -- private/private/protected destcrutor + or c.xarg.fullname=='QWebSettings' -- private/protected destcrutor + or c.xarg.fullname=='QAccessibleObject' -- private/protected destcrutor + or c.xarg.fullname=='QAccessibleObject' -- private/protected destcrutor + or c.xarg.fullname=='QAccessibleObject' -- private/protected destcrutor + or c.xarg.fullname=='QtConcurrent::ThreadEngineBarrier' -- linker error + -- platform specific, TODO or c.xarg.fullname=='QWindowsCEStyle' or c.xarg.fullname=='QWindowsMobileStyle' @@ -36,6 +51,8 @@ for c in pairs(classes) do or c.xarg.fullname=='QForeachContainerBase' -- "was not declared in this scope" or c.xarg.fullname=='QtConcurrent::Exception' -- GCC throw() in destructor base declaration or c.xarg.fullname=='QtConcurrent::UnhandledException' -- GCC throw() in destructor base declaration + or c.xarg.fullname=='QEasingCurve' + or c.xarg.fullname=='QHashData' -- 2.11.4.GIT