Attachment 360 Details for Bug 816 – Patch used to build tqtinterface with tqt3 (not qt3) installed.

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.

[patch] Patch used to build tqtinterface with tqt3 (not qt3) installed.

tqtinterface-tqt3-detect.diff (text/plain), 2.19 KB, created by Darrell on 2012-02-17 14:51:21 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-02-17 14:51:21 CST

Size: 2.19 KB

patch

obsolete

>diff -urN tqtinterface/CMakeLists.txt tqtinterface.new/CMakeLists.txt
>--- tqtinterface/CMakeLists.txt	2011-12-24 23:23:03.000000000 -0600
>+++ tqtinterface.new/CMakeLists.txt	2012-01-26 16:58:46.000000000 -0600
>@@ -22,6 +22,7 @@
> cmake_minimum_required( VERSION 2.8 )
> 
> include( CheckCXXSourceCompiles )
>+include( FindPkgConfig )
> 
> set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
> include( TDEMacros )
>diff -urN tqtinterface/ConfigureChecks.cmake tqtinterface.new/ConfigureChecks.cmake
>--- tqtinterface/ConfigureChecks.cmake	2012-01-24 19:27:56.000000000 -0600
>+++ tqtinterface.new/ConfigureChecks.cmake	2012-01-26 17:09:43.000000000 -0600
>@@ -18,7 +18,7 @@
>   set( QT_VERSION "3" )
> elseif( DEFINED USE_QT4 )
>   set( QT_VERSION "4" )
>-endif()
>+endif( )
> 
> 
> if( NOT DEFINED QT_VERSION )
>@@ -47,15 +47,32 @@
> 
> # qt headers
> if( NOT DEFINED QT_INCLUDE_DIR )
>-  if( QT_PREFIX_DIR STREQUAL "/usr" )
>+  pkg_search_module( TQTMT tqt-mt )
>+  pkg_search_module( QTMT qt-mt )
>+  if( TQTMT_FOUND )
>+    qt_message( "  Native TQt3 detected" )
>     if( EXISTS "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )
>       set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" )
>       set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )
>-    else( )
>+    elseif( EXISTS "${QT_PREFIX_DIR}/include/tqt" )
>+      set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt" )
>+      set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )
>+    elseif( EXISTS "${QT_PREFIX_DIR}/include" )
>+      set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
>+      set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" )
>+    endif( )
>+  elseif( QTMT_FOUND )
>+    qt_message( "  Qt3 detected" )
>+    if( EXISTS "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" )
>       set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" )
>+    elseif( EXISTS "${QT_PREFIX_DIR}/include/qt" )
>+      set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt" )
>+    elseif( EXISTS "${QT_PREFIX_DIR}/include" )
>+      set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
>     endif( )
>   else( )
>     set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" )
>+    qt_message( "  Neither Native TQt3 or Qt3 detected" )
>   endif( )
> endif( )
> qt_message( "  QT_INCLUDE_DIR: ${QT_INCLUDE_DIR}" )

Actions: View | Diff

Attachments on bug 816: 360