Fix more FTBFS

qtinterface/CMakeLists.txt

@@ -11,11 +11,19 @@
 #
 #################################################
 
+if ( NOT HAVE_REAL_TQT )
+  set( IFACE "interface_qt3" )
+else ( NOT HAVE_REAL_TQT )
+  set( IFACE "interface_tqt3" )
+endif ( NOT HAVE_REAL_TQT )
+
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/private
   ${QT_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}
+  ${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}/private
 )
 
 link_directories(
@@ -25,12 +33,6 @@ link_directories(
 
 ##### headers ###################################
 
-if ( NOT HAVE_REAL_TQT )
-  set( IFACE "interface_qt3" )
-else ( NOT HAVE_REAL_TQT )
-  set( IFACE "interface_tqt3" )
-endif ( NOT HAVE_REAL_TQT )
-
 configure_file( tqt.h.cmake tqt.h @ONLY )
 
 install( FILES
@@ -144,7 +146,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tqt.pc DESTINATION ${PKGCONFIG_INSTAL
 ##### tqt (shared) ##############################
 
 
-tde_add_library( ${IFACE}/tqt SHARED
+tde_add_library( tqt SHARED
   SOURCES
     ${IFACE}/tqt.cpp ${IFACE}/tqaccel.cpp ${IFACE}/tqaccessible.cpp ${IFACE}/tqaction.cpp ${IFACE}/tqapplication.cpp
     ${IFACE}/tqasyncio.cpp ${IFACE}/tqbuttongroup.cpp ${IFACE}/tqbutton.cpp ${IFACE}/tqcanvas.cpp ${IFACE}/tqcdestyle.cpp

qtinterface/interface_tqt3/tqlistiterator.cpp

@@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
 */
 
 #include <tqt.h>
-#include <ntqlistiterator.h>
+#include <tqlistiterator.h>
 
 #ifdef USE_QT4