Changeset 389 for trunk/qmake

Timestamp:

Dec 5, 2009, 3:31:52 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Adopted qmake.pro for OS/2. Also include src/qt_targerts.pri to embed the version information into the executable.

Location:

trunk/qmake

Files:

• qmake.pri (modified) (3 diffs)
• qmake.pro (modified) (1 diff)

trunk/qmake/qmake.pri

@@ -14 +14 @@
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
            generators/win32/msvc_dsp.cpp generators/win32/msvc_vcproj.cpp \
-           generators/win32/msvc_objectmodel.cpp
+           generators/win32/msvc_objectmodel.cpp generators/os2/gnumake.cpp
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
@@ -21 +21 @@
            generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \
            generators/win32/msvc_dsp.h generators/win32/msvc_vcproj.h \
-           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h
+           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
+           generators/os2/gnumake.h
 
 contains(QT_EDITION, OpenSource) {
@@ -109 +110 @@
         }
     } else:win32 {
-        SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp
+        SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp
         win32-msvc*:LIBS += ole32.lib advapi32.lib
+    } else:os2 {
+        SOURCES += qfsfileengine_os2.cpp qfsfileengine_iterator_os2.cpp qsettings_os2.cpp
+        LIBS += -lregistry.dll
     }
 

trunk/qmake/qmake.pro

@@ -19 +19 @@
          $$QT_SOURCE_TREE/src/corelib/io \
          $$QT_SOURCE_TREE/src/script
-INCPATH += generators generators/unix generators/win32 generators/mac \
+INCPATH += generators generators/unix generators/win32 generators/os2 generators/mac \
            $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore \
            $$QT_SOURCE_TREE/qmake $$QT_SOURCE_TREE/include/QtScript
 include(qmake.pri)
 
+include(../src/qt_targets.pri)