Hello community,
here is the log from the commit of package kdebindings-smokeqt for
openSUSE:Factory checked in at 2012-01-27 15:18:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebindings-smokeqt (Old)
and /work/SRC/openSUSE:Factory/.kdebindings-smokeqt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebindings-smokeqt", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebindings-smokeqt/kdebindings-smokeqt.changes
2011-12-08 11:51:32.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kdebindings-smokeqt.new/kdebindings-smokeqt.changes
2012-01-27 15:20:29.000000000 +0100
@@ -1,0 +2,16 @@
+Wed Jan 18 21:01:22 CET 2012 - dmuel...@suse.de
+
+- update to 4.8.0
+ * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Tue Jan 10 16:36:21 CET 2012 - dmuel...@suse.de
+
+- update to 4.7.98
+ * RC2+ milestone release of KDE 4.8
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
Old:
----
smokeqt-4.7.4.tar.bz2
New:
----
smokeqt-4.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings-smokeqt.spec ++++++
--- /var/tmp/diff_new_pack.jMfIgl/_old 2012-01-27 15:20:31.000000000 +0100
+++ /var/tmp/diff_new_pack.jMfIgl/_new 2012-01-27 15:20:31.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kdebindings-smokeqt
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
Name: kdebindings-smokeqt
-Version: 4.7.4
+Version: 4.8.0
Release: 0
Summary: SMOKE-Qt library for kdebindings
License: LGPL-2.1+
@@ -39,12 +39,14 @@
%package -n libsmokeqt
Summary: SMOKE-Qt library for kdebindings
+Group: Development/Libraries/KDE
%description -n libsmokeqt
SMOKE bindings for the Qt libraries. Used by language bindings.
%package -n libsmokeqt-devel
Summary: Development files for libsmokeqt
+Group: Development/Libraries/KDE
Requires: libsmokeqt = %{version}
%description -n libsmokeqt-devel
++++++ smokeqt-4.7.4.tar.bz2 -> smokeqt-4.8.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/AUTHORS new/smokeqt-4.8.0/AUTHORS
--- old/smokeqt-4.7.4/AUTHORS 2011-08-22 15:23:18.000000000 +0200
+++ new/smokeqt-4.8.0/AUTHORS 2011-07-27 20:36:49.000000000 +0200
@@ -1,2 +0,0 @@
-Arno Rehn <arno at arnorehn.de> - author
-Richard Dale <richard.j.dale at gmail.com> - maintainer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/CMakeLists.txt
new/smokeqt-4.8.0/CMakeLists.txt
--- old/smokeqt-4.7.4/CMakeLists.txt 2011-05-20 22:33:32.000000000 +0200
+++ new/smokeqt-4.8.0/CMakeLists.txt 2011-12-20 20:11:00.000000000 +0100
@@ -6,13 +6,18 @@
find_package(Qt4 REQUIRED)
find_package(Smoke)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${SMOKE_CMAKE_MODULE_DIR}")
include(MacroOptionalFindPackage)
include(MacroOptionalAddBindings)
include(MacroLogFeature)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SMOKE_INCLUDE_DIR})
+# Set LIB_INSTALL_DIR if it's not set already.
+if (NOT LIB_INSTALL_DIR)
+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+endif (NOT LIB_INSTALL_DIR)
+
macro_optional_find_package(QImageBlitz)
macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "QImageBlitz library"
"http://www.kde.org"; FALSE "" "Needed to compile QImageBlitz bindings")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/phonon/CMakeLists.txt
new/smokeqt-4.8.0/phonon/CMakeLists.txt
--- old/smokeqt-4.7.4/phonon/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/phonon/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -21,7 +21,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtcore/config.xml"
-smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I "${PHONON_INCLUDE_DIR}" --
${CMAKE_CURRENT_SOURCE_DIR}/phonon_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -49,5 +50,11 @@
set_target_properties(smokephonon PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokephonon DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokephonon LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokephonon PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../phonon_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/phonon/smokeconfig.xml
new/smokeqt-4.8.0/phonon/smokeconfig.xml
--- old/smokeqt-4.7.4/phonon/smokeconfig.xml 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/phonon/smokeconfig.xml 2011-12-20 20:11:00.000000000
+0100
@@ -27,14 +27,17 @@
<class>Phonon::AbstractVideoOutput</class>
<class>Phonon::AudioDataOutput</class>
<class>Phonon::AudioOutput</class>
+ <class>Phonon::Capture</class>
<class>Phonon::Effect</class>
<class>Phonon::EffectParameter</class>
<class>Phonon::EffectWidget</class>
<class>Phonon::GlobalConfig</class>
<class>Phonon::MediaController</class>
+ <class>Phonon::MediaController::NavigationMenu</class>
<class>Phonon::MediaNode</class>
<class>Phonon::MediaObject</class>
<class>Phonon::MediaSource</class>
+ <class>Phonon::Mrl</class>
<class>Phonon::ObjectDescriptionData</class>
<class>Phonon::ObjectDescriptionModelData</class>
<class>Phonon::Path</class>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qimageblitz/CMakeLists.txt
new/smokeqt-4.8.0/qimageblitz/CMakeLists.txt
--- old/smokeqt-4.7.4/qimageblitz/CMakeLists.txt 2011-05-20
22:33:32.000000000 +0200
+++ new/smokeqt-4.8.0/qimageblitz/CMakeLists.txt 2011-12-20
20:11:00.000000000 +0100
@@ -10,7 +10,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtcore/config.xml"
-smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I ${QIMAGEBLITZ_INCLUDES} --
${CMAKE_CURRENT_SOURCE_DIR}/qimageblitz_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -28,5 +29,12 @@
set_target_properties(smokeqimageblitz PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqimageblitz DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqimageblitz
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqimageblitz PROPERTIES PREFIX "" IMPORT_PREFIX
"")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qimageblitz_smoke.h DESTINATION
include/smoke )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qsci/CMakeLists.txt
new/smokeqt-4.8.0/qsci/CMakeLists.txt
--- old/smokeqt-4.7.4/qsci/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qsci/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -19,7 +19,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtgui/config.xml"
-smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I "${QSCINTILLA_INCLUDE_DIR}" --
${CMAKE_CURRENT_SOURCE_DIR}/qscintilla2_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -44,5 +45,11 @@
set_target_properties(smokeqsci PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqsci DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
)
+install(TARGETS smokeqsci LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqsci PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qsci_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qt3support/CMakeLists.txt
new/smokeqt-4.8.0/qt3support/CMakeLists.txt
--- old/smokeqt-4.7.4/qt3support/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qt3support/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -31,7 +31,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qt3support_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -83,7 +84,15 @@
set_target_properties(smokeqt3support PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqt3support DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqt3support
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+# Get rid of the "lib" prefix on archives/DLLs in Windows.
+if (WIN32)
+ set_target_properties(smokeqt3support
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qt3support_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtcore/CMakeLists.txt
new/smokeqt-4.8.0/qtcore/CMakeLists.txt
--- old/smokeqt-4.7.4/qtcore/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtcore/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -40,7 +40,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtcore_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -80,9 +81,16 @@
set_target_properties(smokeqtcore PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtcore DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtcore LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtcore
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtcore_smoke.h DESTINATION
include/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt-config.xml DESTINATION
share/smokegen)
install(FILES ${QTDEFINES_FILE} DESTINATION share/smokegen)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtdbus/CMakeLists.txt
new/smokeqt-4.8.0/qtdbus/CMakeLists.txt
--- old/smokeqt-4.7.4/qtdbus/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtdbus/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtdbus_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -32,7 +33,14 @@
set_target_properties(smokeqtdbus PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtdbus DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtdbus LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtdbus
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtdbus_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtdbus/smokeconfig.xml
new/smokeqt-4.8.0/qtdbus/smokeconfig.xml
--- old/smokeqt-4.7.4/qtdbus/smokeconfig.xml 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtdbus/smokeconfig.xml 2011-12-20 20:11:00.000000000
+0100
@@ -56,6 +56,8 @@
<class>QDBusPendingCallWatcher</class>
<class>QDBusServer</class>
<class>QDBusServiceWatcher</class>
+ <class>QDBusUnixFileDescriptor</class>
+ <class>QDBusVirtualObject</class>
<!-- namespaces -->
<class>QDBus</class>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtdeclarative/CMakeLists.txt
new/smokeqt-4.8.0/qtdeclarative/CMakeLists.txt
--- old/smokeqt-4.7.4/qtdeclarative/CMakeLists.txt 2011-05-20
22:33:32.000000000 +0200
+++ new/smokeqt-4.8.0/qtdeclarative/CMakeLists.txt 2011-12-20
20:11:00.000000000 +0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtdeclarative_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -39,7 +40,15 @@
set_target_properties(smokeqtdeclarative PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtdeclarative DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtdeclarative
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtdeclarative
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtdeclarative_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtgui/CMakeLists.txt
new/smokeqt-4.8.0/qtgui/CMakeLists.txt
--- old/smokeqt-4.7.4/qtgui/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtgui/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -30,7 +30,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtgui_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -70,7 +71,14 @@
set_target_properties(smokeqtgui PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtgui DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtgui LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtgui
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtgui_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtgui/smokeconfig.xml
new/smokeqt-4.8.0/qtgui/smokeconfig.xml
--- old/smokeqt-4.7.4/qtgui/smokeconfig.xml 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtgui/smokeconfig.xml 2011-12-20 20:11:00.000000000
+0100
@@ -57,6 +57,7 @@
<class>QAbstractTextDocumentLayout::Selection</class>
<class>QAbstractUndoItem</class>
<class>QAccessible2</class>
+ <class>QAccessible2::TableModelChange</class>
<class>QAccessible2Interface</class>
<class>QAccessibleActionInterface</class>
<class>QAccessibleApplication</class>
@@ -75,6 +76,8 @@
<class>QAccessiblePlugin</class>
<class>QAccessibleSimpleEditableTextInterface</class>
<class>QAccessibleTableInterface</class>
+ <class>QAccessibleTable2Interface</class>
+ <class>QAccessibleTable2CellInterface</class>
<class>QAccessibleTextInterface</class>
<class>QAccessibleValueInterface</class>
<class>QAccessibleWidget</class>
@@ -125,7 +128,6 @@
<class>QDragResponseEvent</class>
<class>QDropEvent</class>
<class>QErrorMessage</class>
- <class>QFactoryInterface</class>
<class>QFileDialogArgs</class>
<class>QFileDialog</class>
<class>QFileDialog::Options</class>
@@ -148,6 +150,7 @@
<class>QGesture</class>
<class>QGestureEvent</class>
<class>QGestureRecognizer</class>
+ <class>QGlyphRun</class>
<class>QGradient</class>
<class>QGraphicsAnchor</class>
<class>QGraphicsAnchorLayout</class>
@@ -266,6 +269,7 @@
<class>QPaintEngine</class>
<class>QPaintEngineState</class>
<class>QPainter</class>
+ <class>QPainter::PixmapFragment</class>
<class>QPainterPath</class>
<class>QPainterPath::Element</class>
<class>QPainterPathStroker</class>
@@ -300,6 +304,7 @@
<class>QQuaternion</class>
<class>QRadialGradient</class>
<class>QRadioButton</class>
+ <class>QRawFont</class>
<class>QRegExpValidator</class>
<class>QRegion</class>
<class>QResizeEvent</class>
@@ -329,6 +334,7 @@
<class>QStackedWidget</class>
<class>QStandardItem</class>
<class>QStandardItemModel</class>
+ <class>QStaticText</class>
<class>QStatusBar</class>
<class>QStatusTipEvent</class>
<class>QStringListModel</class>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qthelp/CMakeLists.txt
new/smokeqt-4.8.0/qthelp/CMakeLists.txt
--- old/smokeqt-4.7.4/qthelp/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qthelp/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qthelp_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -39,7 +40,14 @@
set_target_properties(smokeqthelp PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqthelp DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqthelp LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqthelp
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qthelp_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtmultimedia/CMakeLists.txt
new/smokeqt-4.8.0/qtmultimedia/CMakeLists.txt
--- old/smokeqt-4.7.4/qtmultimedia/CMakeLists.txt 2011-05-20
22:33:32.000000000 +0200
+++ new/smokeqt-4.8.0/qtmultimedia/CMakeLists.txt 2011-12-20
20:11:00.000000000 +0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtmultimedia_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -36,7 +37,15 @@
set_target_properties(smokeqtmultimedia PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtmultimedia DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtmultimedia
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtmultimedia
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtmultimedia_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtnetwork/CMakeLists.txt
new/smokeqt-4.8.0/qtnetwork/CMakeLists.txt
--- old/smokeqt-4.7.4/qtnetwork/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtnetwork/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtnetwork_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -32,7 +33,15 @@
set_target_properties(smokeqtnetwork PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtnetwork DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtnetwork
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtnetwork
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtnetwork_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtnetwork/smokeconfig.xml
new/smokeqt-4.8.0/qtnetwork/smokeconfig.xml
--- old/smokeqt-4.7.4/qtnetwork/smokeconfig.xml 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtnetwork/smokeconfig.xml 2011-12-20 20:11:00.000000000
+0100
@@ -43,6 +43,8 @@
<class>QHostInfo</class>
<class>QHttp</class>
<class>QHttpHeader</class>
+ <class>QHttpMultiPart</class>
+ <class>QHttpPart</class>
<class>QHttpRequestHeader</class>
<class>QHttpResponseHeader</class>
<class>QIPv6Address</class>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtopengl/CMakeLists.txt
new/smokeqt-4.8.0/qtopengl/CMakeLists.txt
--- old/smokeqt-4.7.4/qtopengl/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtopengl/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -10,7 +10,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtopengl_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -36,7 +37,14 @@
set_target_properties(smokeqtopengl PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtopengl DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtopengl LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtopengl
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtopengl_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtscript/CMakeLists.txt
new/smokeqt-4.8.0/qtscript/CMakeLists.txt
--- old/smokeqt-4.7.4/qtscript/CMakeLists.txt 2011-08-22 15:23:18.000000000
+0200
+++ new/smokeqt-4.8.0/qtscript/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -1,4 +1,3 @@
-
include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} )
configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY)
@@ -9,7 +8,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtscript_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -27,5 +27,13 @@
set_target_properties(smokeqtscript PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqtscript DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtscript LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtscript
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtscript_smoke.h DESTINATION
include/smoke )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtsql/CMakeLists.txt
new/smokeqt-4.8.0/qtsql/CMakeLists.txt
--- old/smokeqt-4.7.4/qtsql/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtsql/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtsql_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -39,7 +40,14 @@
set_target_properties(smokeqtsql PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtsql DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtsql LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtsql
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtsql_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtsvg/CMakeLists.txt
new/smokeqt-4.8.0/qtsvg/CMakeLists.txt
--- old/smokeqt-4.7.4/qtsvg/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtsvg/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtsvg_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -37,7 +38,14 @@
set_target_properties(smokeqtsvg PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtsvg DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtsvg LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtsvg
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtsvg_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qttest/CMakeLists.txt
new/smokeqt-4.8.0/qttest/CMakeLists.txt
--- old/smokeqt-4.7.4/qttest/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qttest/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -8,7 +8,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qttest_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -31,5 +32,14 @@
set_target_properties(smokeqttest PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqttest DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqttest LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqttest
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qttest_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtuitools/CMakeLists.txt
new/smokeqt-4.8.0/qtuitools/CMakeLists.txt
--- old/smokeqt-4.7.4/qtuitools/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtuitools/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -8,7 +8,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtuitools_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -26,5 +27,15 @@
set_target_properties(smokeqtuitools PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqtuitools DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtuitools
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtuitools
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtuitools_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtwebkit/CMakeLists.txt
new/smokeqt-4.8.0/qtwebkit/CMakeLists.txt
--- old/smokeqt-4.7.4/qtwebkit/CMakeLists.txt 2011-08-22 15:23:18.000000000
+0200
+++ new/smokeqt-4.8.0/qtwebkit/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -8,7 +8,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtwebkit_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -31,5 +32,12 @@
set_target_properties(smokeqtwebkit PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqtwebkit DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtwebkit LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtwebkit PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtwebkit_smoke.h DESTINATION
include/smoke )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtwebkit/smokeconfig.xml
new/smokeqt-4.8.0/qtwebkit/smokeconfig.xml
--- old/smokeqt-4.7.4/qtwebkit/smokeconfig.xml 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtwebkit/smokeconfig.xml 2011-12-20 20:11:00.000000000
+0100
@@ -33,6 +33,7 @@
<class>QWebPage::ErrorPageExtensionReturn</class>
<class>QWebPage::ExtensionOption</class>
<class>QWebPage::ExtensionReturn</class>
+ <class>QWebPage::ViewportAttributes</class>
<class>QWebPluginFactory</class>
<class>QWebPluginFactory::ExtensionOption</class>
<class>QWebPluginFactory::ExtensionReturn</class>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtxml/CMakeLists.txt
new/smokeqt-4.8.0/qtxml/CMakeLists.txt
--- old/smokeqt-4.7.4/qtxml/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qtxml/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtxml_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -35,7 +36,14 @@
set_target_properties(smokeqtxml PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtxml DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtxml LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtxml
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtxml_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qtxmlpatterns/CMakeLists.txt
new/smokeqt-4.8.0/qtxmlpatterns/CMakeLists.txt
--- old/smokeqt-4.7.4/qtxmlpatterns/CMakeLists.txt 2011-05-20
22:33:32.000000000 +0200
+++ new/smokeqt-4.8.0/qtxmlpatterns/CMakeLists.txt 2011-12-20
20:11:00.000000000 +0100
@@ -11,7 +11,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtxmlpatterns_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -36,7 +37,15 @@
set_target_properties(smokeqtxmlpatterns PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtxmlpatterns DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtxmlpatterns
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtxmlpatterns
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtxmlpatterns_smoke.h DESTINATION
include/smoke)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokeqt-4.7.4/qwt/CMakeLists.txt
new/smokeqt-4.8.0/qwt/CMakeLists.txt
--- old/smokeqt-4.7.4/qwt/CMakeLists.txt 2011-05-20 22:33:32.000000000
+0200
+++ new/smokeqt-4.8.0/qwt/CMakeLists.txt 2011-12-20 20:11:00.000000000
+0100
@@ -19,7 +19,8 @@
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtgui/config.xml"
-smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I "${Qwt5_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/qwt_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -44,5 +45,14 @@
set_target_properties(smokeqwt PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqwt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqwt LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqwt
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qwt_smoke.h DESTINATION
include/smoke)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
