Hi

I am trying to integrate qt4.6 into ptxdist. It seems as if some options have 
gone missing. I removed them. My changes to the 
QT rules are below and are in my locales project rules directory. I still get 
the error that:

make[1]: *** No rule to make target `confclean'.  Stop.
make[1]: Entering directory 
`/home/sander/qt46/ptx/platform-pmx-one/build-host/qt-everywhere-opensource-src-4.6.2'
make[1]: Leaving directory 
`/home/sander/qt46/ptx/platform-pmx-one/build-host/qt-everywhere-opensource-src-4.6.2'
 
-no-kbd-usb: unknown argument                                                   
                                  
-no-kbd-sl5000: unknown argument                                                
                                  
-no-kbd-yopy: unknown argument      
...
As i removed all these Options i am puzzled where they are comming from? Any 
ideas
Thanks
Tim


diff --git a/rules/qt4.in b/rules/qt4.in      
index 21f37d8..08874e6 100644                 
--- a/rules/qt4.in                            
+++ b/rules/qt4.in                            
@@ -3,7 +3,6 @@                               
 menuconfig QT4                               
        tristate                              
        select HOST_QT4                       
-       select TSLIB            if QT4_MOUSE_TSLIB
        select DBUS             if QT4_DBUS_LOAD || QT4_DBUS_LINK
        select GLIB             if QT4_GLIB                      
        select ZLIB             if QT4_ZLIB_SYSTEM               
@@ -283,73 +282,14 @@ config QT4_KBD_TTY                         
        help                                                     
          Generic console (tty) driver                           
                                                                 
-config QT4_KBD_USB                                              
-       bool                                                     
-       prompt "USB"                                             
-       help                                                     
-         Generic usb keyboard driver                            
-                                                                
-config QT4_KBD_SL5000                                           
-       bool                                                     
-       prompt "SL5000 [BROKEN]"                                 
-       # needs asm/sharp_char.h                                 
-       depends on BROKEN                                        
-                                                                
-config QT4_KBD_YOPY                                             
-       bool                                                     
-       prompt "Yopy [BROKEN]"                                   
-       # needs linux/yopy_button.h                              
-       depends on BROKEN                                        
-                                                                
-config QT4_KBD_VR41XX                                           
-       bool                                                     
-       prompt "Vr41XX"                                          
-                                                                
-config QT4_KBD_QVFB                                             
-       bool                                                     
-       prompt "Qt Virtual Frambuffer"                           
-       help                                                     
-         Keyboard driver for the Qt Virtual Frambuffer          
-                                                                
 endmenu                                                         
                                                                 
 menu "mouse drivers               "                             
                                                                 
-config QT4_MOUSE_PC                                             
-       bool                                                     
-       prompt "Generic Mouse Driver"                            
-       help                                                     
-         Generic driver for the MouseMan, IntelliMouse, Microsoft and 
MouseSystems
-         protocols.                                                            
   
-                                                                               
   
-config QT4_MOUSE_BUS                                                           
   
-       bool                                                                    
   
-       prompt "Bus"                                                            
   
-                                                                               
   
 config QT4_MOUSE_LINUXTP                                                       
   
        bool                                                                    
   
        prompt "Linux Touch Panel"                                              
   
                                                                                
   
-config QT4_MOUSE_YOPY                                                          
   
-       bool                                                                    
   
-       prompt "Yopy"                                                           
   
-                                                                               
   
-config QT4_MOUSE_VR41XX                                                        
   
-       bool                                                                    
   
-       prompt "NEC Vr41XX"                                                     
   
-                                                                               
   
-config QT4_MOUSE_TSLIB                                                         
   
-       bool                                                                    
   
-       prompt "Tslib"                                                          
   
-       help                                                                    
   
-         Driver for the universal touch screen library, tslib.                 
   
-                                                                               
   
-config QT4_MOUSE_QVFB                                                          
   
-       bool                                                                    
   
-       prompt "Qt Virtual Frambuffer"                                          
   
-       help                                                                    
   
-         Mouse driver for the Qt Virtual Frambuffer                            
   
-                                                                               
   
 endmenu                                                                        
   
                                                                                
   
 # prepare the build system to build the examples                               
   
diff --git a/rules/qt4.make b/rules/qt4.make                                    
   
index 784fb0e..a2ee541 100644                                                   
   
--- a/rules/qt4.make                                                            
   
+++ b/rules/qt4.make                                                            
   
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_QT4) += qt4                                
   
 #                                                                              
   
 # Paths and names                                                              
   
 #                                                                              
   
-QT4_VERSION    := 4.5.3                                                        
   
-QT4            := qt-embedded-linux-opensource-src-$(QT4_VERSION)              
   
+QT4_VERSION    := 4.6.2                                                        
   
+QT4            := qt-everywhere-opensource-src-$(QT4_VERSION)                  
   
 QT4_SUFFIX     := tar.gz                                                       
   
 QT4_URL                := 
http://get.qt.nokia.com/qt/source/$(QT4).$(QT4_SUFFIX)  
 QT4_SOURCE     := $(SRCDIR)/$(QT4).$(QT4_SUFFIX)                               
   
@@ -205,20 +205,6 @@ else                                                       
   
 QT4_AUTOCONF += -no-kbd-tty                                                    
   
 endif                                                                          
   
                                                                                
   
-# usb keyboard driver                                                          
   
-ifdef PTXCONF_QT4_KBD_USB                                                      
   
-QT4_AUTOCONF += -qt-kbd-usb                                                    
   
-else                                                                           
   
-QT4_AUTOCONF += -no-kbd-usb                                                    
   
-endif                                                                          
   
-                                                                               
   
-# sl5000 keyboard driver                                                       
   
-ifdef PTXCONF_QT4_KBD_SL5000                                                   
   
-QT4_AUTOCONF += -qt-kbd-sl5000                                                 
   
-else                                                                           
   
-QT4_AUTOCONF += -no-kbd-sl5000                                                 
   
-endif                                                                          
   
-                                                                               
   
 # yopy keyboard driver                                                         
   
 ifdef PTXCONF_QT4_KBD_YOPY                                                     
   
 QT4_AUTOCONF += -qt-kbd-yopy                                                   
   
@@ -226,34 +212,6 @@ else                                                       
   
 QT4_AUTOCONF += -no-kbd-yopy                                                   
   
 endif                                                                          
   
                                                                                
   
-# vr41xx keyboard driver                                                       
   
-ifdef PTXCONF_QT4_KBD_VR41XX                                                   
   
-QT4_AUTOCONF += -qt-kbd-vr41xx                                                 
   
-else                                                                           
   
-QT4_AUTOCONF += -no-kbd-vr41xx                                                 
   
-endif                                                                          
   
-                                                                               
   
-# qvfb keyboard driver                                                         
   
-ifdef PTXCONF_QT4_KBD_QVFB                                                     
   
-QT4_AUTOCONF += -qt-kbd-qvfb                                                   
   
-else                                                                           
   
-QT4_AUTOCONF += -no-kbd-qvfb                                                   
   
-endif                                                                          
   
-                                                                               
   
-# pc mouse driver                                                              
   
-ifdef PTXCONF_QT4_MOUSE_PC                                                     
   
-QT4_AUTOCONF += -qt-mouse-pc                                                   
   
-else                                                                           
   
-QT4_AUTOCONF += -no-mouse-pc                                                   
   
-endif                                                                          
   
-                                                                               
   
-# bus mouse driver                                                             
   
-ifdef PTXCONF_QT4_MOUSE_BUS                                                    
   
-QT4_AUTOCONF += -qt-mouse-bus                                                  
   
-else                                                                           
   
-QT4_AUTOCONF += -no-mouse-bus                                                  
   
-endif                                                                          
   
-                                                                               
   
 # linuxtp mouse driver                                                         
   
 ifdef PTXCONF_QT4_MOUSE_LINUXTP                                                
   
 QT4_AUTOCONF += -qt-mouse-linuxtp                                              
   
@@ -261,13 +219,6 @@ else                                                       
   
 QT4_AUTOCONF += -no-mouse-linuxtp                                              
   
 endif                                                                          
   
                                                                                
   
-# yopy mouse driver                                                            
   
-ifdef PTXCONF_QT4_MOUSE_YOPY
-QT4_AUTOCONF += -qt-mouse-yopy
-else
-QT4_AUTOCONF += -no-mouse-yopy
-endif
-
 # vr41xx mouse driver
 ifdef PTXCONF_QT4_MOUSE_VR41XX
 QT4_AUTOCONF += -qt-mouse-vr41xx
@@ -275,20 +226,6 @@ else
 QT4_AUTOCONF += -no-mouse-vr41xx
 endif

-# tslib mouse driver
-ifdef PTXCONF_QT4_MOUSE_TSLIB
-QT4_AUTOCONF += -qt-mouse-tslib
-else
-QT4_AUTOCONF += -no-mouse-tslib
-endif
-
-# qvfb mouse driver
-ifdef PTXCONF_QT4_MOUSE_QVFB
-QT4_AUTOCONF += -qt-mouse-qvfb
-else
-QT4_AUTOCONF += -no-mouse-qvfb
-endif
-
 # PNG support
 ifdef PTXCONF_QT4_PNG_NONE
 QT4_AUTOCONF += -no-libpng
@@ -882,4 +819,13 @@ endif

        @$(call touch)

+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+qt4_clean:
+       rm -rf $(STATEDIR)/qt4.*
+       rm -rf $(IMAGEDIR)/qt4_*
+       rm -rf $(QT4_DIR)
+
 # vim: syntax=make

--
ptxdist mailing list
[email protected]

Reply via email to