From 6b9d82f41d6fcfa6661c4afd0eb22e0bddc64eb8 Mon Sep 17 00:00:00 2001 From: Franck Bettinger Date: Thu, 12 Sep 2002 11:37:16 -0400 Subject: [PATCH] corrected test for QTWrapUI --- Tests/Wrapping/CMakeLists.txt | 9 +++++---- Tests/Wrapping/qtwrappingmain.cxx | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt index e09a01562..7d615bbcb 100644 --- a/Tests/Wrapping/CMakeLists.txt +++ b/Tests/Wrapping/CMakeLists.txt @@ -27,7 +27,7 @@ ENDIF (EXECUTABLE_OUTPUT_PATH) # Add exe # ADD_EXECUTABLE (wrapping wrapping.cxx) -ADD_EXECUTABLE (qtwrappingmain qtwrappingmain.cxx QTUI_S_SRCS) +ADD_EXECUTABLE (qtwrapping qtwrappingmain.cxx QTUI_S_SRCS) # # Test VTK wrappers @@ -81,14 +81,15 @@ CONFIGURE_FILE( # QT Wrappers # +SET (QT_WRAP_CPP "On") +SET (QT_MOC_EXE "echo") + INCLUDE( ../../Modules/FindQt.cmake ) INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ./ ) LINK_LIBRARIES( ${QT_LIBRARIES} ) -SET (QT_WRAP_CPP "On") -SET (QT_MOC_EXE "echo") QT_WRAP_CPP (wraplibQT QT_SRCS SRCS) SET (QT_WRAP_UI "On") @@ -96,7 +97,7 @@ SET (QT_UIC_EXE "echo") SET (QTUI_SRCS qtwrapping.ui ) -QT_WRAP_UI (qtwrappingmain QTUI_H_SRCS QTUI_S_SRCS QTUI_SRCS) +QT_WRAP_UI (qtwrapping QTUI_H_SRCS QTUI_S_SRCS QTUI_SRCS) # # FLTK Wrappers diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx index bf6780046..81ddaf485 100644 --- a/Tests/Wrapping/qtwrappingmain.cxx +++ b/Tests/Wrapping/qtwrappingmain.cxx @@ -8,8 +8,6 @@ QApplication app(argc,argv); qtwrapping qtw; app.setMainWidget(&qtw); -qtw.show(); -int ret=app.exec(); -return ret; +return 0; }