Changeset 60

Timestamp:

Jun 26, 2009, 12:55:38 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Alter .pro files to take OS/2 into account (many modules are disabled yet).

Location:

trunk/src

Files:

• corelib/io/io.pri (modified) (1 diff)
• plugins/plugins.pro (modified) (1 diff)
• plugins/qpluginbase.pri (modified) (1 diff)
• qbase.pri (modified) (3 diffs)
• qt_install.pri (modified) (1 diff)
• src.pro (modified) (1 diff)
• tools/bootstrap/bootstrap.pro (modified) (2 diffs)

trunk/src/corelib/io/io.pri

@@ -62 +62 @@
 } else:os2 {
         SOURCES += io/qsettings_os2.cpp
-        SOURCES += io/qprocess_os2.cpp
+        # @todo later
+#        SOURCES += io/qprocess_os2.cpp
         SOURCES += io/qfsfileengine_os2.cpp
 
         SOURCES += io/qfsfileengine_iterator_os2.cpp
-        SOURCES += io/qfilesystemwatcher_os2.cpp
-        HEADERS += io/qfilesystemwatcher_os2_p.h
+        # @todo later
+#        SOURCES += io/qfilesystemwatcher_os2.cpp
+#        HEADERS += io/qfilesystemwatcher_os2_p.h
 } else:unix {
         SOURCES += io/qfsfileengine_unix.cpp

trunk/src/plugins/plugins.pro

@@ -9 +9 @@
 !embedded:SUBDIRS *= graphicssystems
 embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
-!win32:!embedded:!mac:SUBDIRS *= inputmethods
+!win32:!os2:!embedded:!mac:SUBDIRS *= inputmethods
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon

trunk/src/plugins/qpluginbase.pri

@@ -7 +7 @@
 CONFIG += qt plugin
 
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
+win32|os2|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
 TARGET = $$qtLibraryTarget($$TARGET)
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols

trunk/src/qbase.pri

@@ -31 +31 @@
 #other
 DESTDIR          = $$QMAKE_LIBDIR_QT
-win32:!wince*:DLLDESTDIR = $$[QT_INSTALL_PREFIX]/bin
+os2|win32:!wince*:DLLDESTDIR = $$[QT_INSTALL_PREFIX]/bin
 
 CONFIG          += qt warn_on depend_includepath
@@ -79 +79 @@
 }
 
-win32:!shared:CONFIG += static
+win32:!shared|os2:!shared:CONFIG += static
 
 win32-borland {
@@ -90 +90 @@
 }
 
-win32 {
+win32|os2 {
     CONFIG += zlib
     INCLUDEPATH += tmp

trunk/src/qt_install.pri

@@ -1 +1 @@
 #always install the library
-win32 {
+win32|os2 {
    dlltarget.path=$$[QT_INSTALL_BINS]
    INSTALLS += dlltarget

trunk/src/src.pro

@@ -29 +29 @@
 contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools
 SRC_SUBDIRS += src_plugins
+
+# @todo on OS/2, forcefully remove modules that are not yet ready
+os2 {
+    SRC_SUBDIRS -= src_tools_uic src_network src_gui src_sql src_qt3support src_tools_uic3 src_svg
+}
 
 src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain

trunk/src/tools/bootstrap/bootstrap.pro

@@ -27 +27 @@
         QT_NO_UNICODETABLES \
         QT_NO_USING_NAMESPACE
-win32:DEFINES += QT_NODLL
+win32|os2:DEFINES += QT_NODLL
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
@@ -89 +89 @@
                  ../../corelib/io/qfsfileengine_iterator_win.cpp
 
+os2:SOURCES += ../../corelib/io/qfsfileengine_os2.cpp \
+               ../../corelib/io/qfsfileengine_iterator_os2.cpp
+                 
 macx: {
    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported)