Merge from BR_Qt48_porting (compatibility with Qt4.8) 14/12/2012

diff --git a/Examples/cppgui1/cppcomposGUI.cxx b/Examples/cppgui1/cppcomposGUI.cxx
index 1d20a616438e84f745dca698652f54e72185ae23..ec6f48fdea1eb3f36cc937f0c8591720113be1a4 100644 (file)
--- a/Examples/cppgui1/cppcomposGUI.cxx
+++ b/Examples/cppgui1/cppcomposGUI.cxx
@@ -44,8 +44,7 @@ extern "C" {
 
 // Constructor
 cppcomposGUI::cppcomposGUI() :
-  SalomeApp_Module( "cppcompos" ), // default name
-  LightApp_Module( "cppcompos" )
+  SalomeApp_Module( "cppcompos" ) // default name
 {
 }
 

diff --git a/module_generator/hxx_tmpl_gui.py b/module_generator/hxx_tmpl_gui.py
index 2950c5dfce38c5a9d4c7f7f4ec458546ee20f747..9697bff97389036a3a1f094e14d31f542f489a90 100644 (file)
--- a/module_generator/hxx_tmpl_gui.py
+++ b/module_generator/hxx_tmpl_gui.py
@@ -40,8 +40,7 @@ using namespace std;
 
 // Constructor
 ${component_name}GUI::${component_name}GUI() :
-  SalomeApp_Module( COMPONENT_NAME ), // Module name
-  LightApp_Module( COMPONENT_NAME )  
+  SalomeApp_Module( COMPONENT_NAME ) // Module name
 {
   // Initializations
   default_bool = false;