projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a49a92b
)
Remove duplicate include for the macros.
author
Stephen Kelly
<stephen.kelly@kdab.com>
Mon, 14 May 2012 08:49:55 +0000
(10:49 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Wed, 16 May 2012 10:04:18 +0000
(12:04 +0200)
The basic config file includes the macros file already if needed.
Change-Id: I8b03360ce1e9fff4a3be5270f659dbe22fc1b295
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
src/dbus/Qt5DBusConfigExtras.cmake.in
patch
|
blob
|
history
diff --git
a/src/dbus/Qt5DBusConfigExtras.cmake.in
b/src/dbus/Qt5DBusConfigExtras.cmake.in
index
e302307
..
2aa857f
100644
(file)
--- a/
src/dbus/Qt5DBusConfigExtras.cmake.in
+++ b/
src/dbus/Qt5DBusConfigExtras.cmake.in
@@
-8,5
+8,3
@@
set(QT_DBUSXML2CPP_EXECUTABLE \"${_qt5_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml
set(QT_DBUSCPP2XML_EXECUTABLE \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
set(QT_DBUSXML2CPP_EXECUTABLE \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
!!ENDIF
-
-include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5DBusMacros.cmake\")