Attachment #360 for bug #816

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 816
Collapse All | Expand All

Lines 22-27 Link Here

(-)tqtinterface/CMakeLists.txt (+1 lines)
22	cmake_minimum_required( VERSION 2.8 )	22	cmake_minimum_required( VERSION 2.8 )
23		23
24	include( CheckCXXSourceCompiles )	24	include( CheckCXXSourceCompiles )
		25	include( FindPkgConfig )
25		26
26	set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )	27	set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
27	include( TDEMacros )	28	include( TDEMacros )

Lines 18-24 Link Here

(-)tqtinterface/ConfigureChecks.cmake (-3 / +20 lines)
18	set( QT_VERSION "3" )	18	set( QT_VERSION "3" )
19	elseif( DEFINED USE_QT4 )	19	elseif( DEFINED USE_QT4 )
20	set( QT_VERSION "4" )	20	set( QT_VERSION "4" )
21	endif()	21	endif( )
22		22
23		23
24	if( NOT DEFINED QT_VERSION )	24	if( NOT DEFINED QT_VERSION )
Lines 47-61 Link Here
47		47
48	# qt headers	48	# qt headers
49	if( NOT DEFINED QT_INCLUDE_DIR )	49	if( NOT DEFINED QT_INCLUDE_DIR )
50	if( QT_PREFIX_DIR STREQUAL "/usr" )	50	pkg_search_module( TQTMT tqt-mt )
		51	pkg_search_module( QTMT qt-mt )
		52	if( TQTMT_FOUND )
		53	qt_message( " Native TQt3 detected" )
51	if( EXISTS "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )	54	if( EXISTS "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )
52	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )	55	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )
53	set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )	56	set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )
54	else( )	57	elseif( EXISTS "${QT_PREFIX_DIR}/include/tqt" )
		58	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt" )
		59	set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )
		60	elseif( EXISTS "${QT_PREFIX_DIR}/include" )
		61	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
		62	set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )
		63	endif( )
		64	elseif( QTMT_FOUND )
		65	qt_message( " Qt3 detected" )
		66	if( EXISTS "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" )
55	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" )	67	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" )
		68	elseif( EXISTS "${QT_PREFIX_DIR}/include/qt" )
		69	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt" )
		70	elseif( EXISTS "${QT_PREFIX_DIR}/include" )
		71	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
56	endif( )	72	endif( )
57	else( )	73	else( )
58	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )	74	set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
		75	qt_message( " Neither Native TQt3 or Qt3 detected" )
59	endif( )	76	endif( )
60	endif( )	77	endif( )
61	qt_message( " QT_INCLUDE_DIR: ${QT_INCLUDE_DIR}" )	78	qt_message( " QT_INCLUDE_DIR: ${QT_INCLUDE_DIR}" )

Return to bug 816