Permalink
Browse files

Fix dead code.

  • Loading branch information...
1 parent 22121f6 commit eeccad57c4b9badd74f3967386c6df4e48908cd9 @legnaleurc committed Apr 30, 2012
Showing with 10 additions and 2 deletions.
  1. +4 −2 CMakeLists.txt
  2. +6 −0 x11/utility/uiinspector.cpp
View
@@ -25,8 +25,6 @@ set(QSNAPSHOT_VERSION_MINOR "1")
set(QSNAPSHOT_VERSION_PATCH "0")
set(QSNAPSHOT_VERSION "${QSNAPSHOT_VERSION_MAJOR}.${QSNAPSHOT_VERSION_MINOR}.${QSNAPSHOT_VERSION_PATCH}")
-configure_file("${CMAKE_SOURCE_DIR}/cmake/modules/qsnapshot_config.h.in" "qsnapshot_config.h")
-
find_package(Qt4 4.6 REQUIRED)
if(UNIX AND NOT APPLE)
find_package(X11 REQUIRED)
@@ -35,8 +33,12 @@ endif()
include(${QT_USE_FILE})
set(HAVE_X11_EXTENSIONS_SHAPE_H ${X11_Xshape_FOUND})
set(HAVE_X11_EXTENSIONS_XFIXES_H ${X11_Xfixes_FOUND})
+message(STATUS ${HAVE_X11_EXTENSIONS_SHAPE_H})
+message(STATUS ${HAVE_X11_EXTENSIONS_XFIXES_H})
include(InstallRequiredSystemLibraries)
+configure_file("${CMAKE_SOURCE_DIR}/cmake/modules/qsnapshot_config.h.in" "qsnapshot_config.h")
+
set(CMAKE_DEBUG_POSTFIX d)
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -pedantic -Wextra -Wall -pipe")
@@ -17,6 +17,12 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "utility/uiinspector.hpp"
+#include "qsnapshot_config.h"
+
+#ifdef HAVE_X11_EXTENSIONS_SHAPE_H
+#include <QtGui/QBitmap>
+#include <QtGui/QPainter>
+#endif // HAVE_X11_EXTENSIONS_SHAPE_H
#include <X11/Xlib.h>
#ifdef HAVE_X11_EXTENSIONS_SHAPE_H

0 comments on commit eeccad5

Please sign in to comment.