Skip to content

Commit 3219fcf

Browse files
author
timlinux
committed
Disable quickprint plugin for release - will redeploy if time allows to convert to new composer code
git-svn-id: http://svn.osgeo.org/qgis/trunk@9222 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e8b9f2d commit 3219fcf

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/plugins/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ ENDIF (GRASS_FOUND)
1818

1919
INSTALL(FILES qgisplugin.h qgsrendererplugin.h DESTINATION ${QGIS_INCLUDE_DIR})
2020

21-
SUBDIRS (quick_print)
21+
#SUBDIRS (quick_print)
2222

2323

2424
SUBDIRS (coordinate_capture dxf2shp_converter)
2525

26-
SUBDIRS (ogr_converter)
26+
SUBDIRS (ogr_converter)

tests/src/gui/CMakeLists.txt

+18-18
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,24 @@ ENDIF (APPLE)
7171
#
7272
# QgsQuickPrint test
7373
#
74-
SET(qgis_quickprinttest_SRCS testqgsquickprint.cpp ${util_SRCS})
75-
SET(qgis_quickprinttest_MOC_CPPS testqgsquickprint.cpp)
76-
QT4_WRAP_CPP(qgis_quickprinttest_MOC_SRCS ${qgis_quickprinttest_MOC_CPPS})
77-
ADD_CUSTOM_TARGET(qgis_quickprinttestmoc ALL DEPENDS ${qgis_quickprinttest_MOC_SRCS})
78-
ADD_EXECUTABLE(qgis_quickprinttest ${qgis_quickprinttest_SRCS})
79-
ADD_DEPENDENCIES(qgis_quickprinttest qgis_quickprinttestmoc)
80-
TARGET_LINK_LIBRARIES(qgis_quickprinttest ${QT_LIBRARIES} qgis_core qgis_gui)
81-
SET_TARGET_PROPERTIES(qgis_quickprinttest
82-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
83-
INSTALL_RPATH_USE_LINK_PATH true)
84-
IF (APPLE)
85-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
86-
INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
87-
ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/qgis_quickprinttest)
88-
ELSE (APPLE)
89-
INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${QGIS_BIN_DIR})
90-
ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/bin/qgis_quickprinttest)
91-
ENDIF (APPLE)
74+
#SET(qgis_quickprinttest_SRCS testqgsquickprint.cpp ${util_SRCS})
75+
#SET(qgis_quickprinttest_MOC_CPPS testqgsquickprint.cpp)
76+
#QT4_WRAP_CPP(qgis_quickprinttest_MOC_SRCS ${qgis_quickprinttest_MOC_CPPS})
77+
#ADD_CUSTOM_TARGET(qgis_quickprinttestmoc ALL DEPENDS ${qgis_quickprinttest_MOC_SRCS})
78+
#ADD_EXECUTABLE(qgis_quickprinttest ${qgis_quickprinttest_SRCS})
79+
#ADD_DEPENDENCIES(qgis_quickprinttest qgis_quickprinttestmoc)
80+
#TARGET_LINK_LIBRARIES(qgis_quickprinttest ${QT_LIBRARIES} qgis_core qgis_gui)
81+
#SET_TARGET_PROPERTIES(qgis_quickprinttest
82+
# PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
83+
# INSTALL_RPATH_USE_LINK_PATH true)
84+
#IF (APPLE)
85+
# # For Mac OS X, the executable must be at the root of the bundle's executable folder
86+
# INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
87+
# ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/qgis_quickprinttest)
88+
#ELSE (APPLE)
89+
# INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${QGIS_BIN_DIR})
90+
# ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/bin/qgis_quickprinttest)
91+
#ENDIF (APPLE)
9292
9393
9494

0 commit comments

Comments
 (0)