diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 5 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++ | 4 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 4 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 3 | ||||
| -rw-r--r-- | qmake/qmake.pri | 3 |
5 files changed, 17 insertions, 2 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 354a73f..4d0121c 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -84,6 +84,7 @@ QTOBJS= \ qtemporaryfile.obj \ qabstractfileengine.obj \ qfsfileengine_win.obj \ + qsystemlibrary.obj \ qfsfileengine_iterator_win.obj \ qfileinfo.obj \ qglobal.obj \ @@ -125,6 +126,7 @@ clean:: -del $(OBJS) -del qmake_pch.obj -del qmake_pch.pch + -del qsystemlibrary.obj -del vc60.pdb -del vc70.pdb -del qmake.pdb @@ -148,6 +150,9 @@ distclean:: clean $(OBJS): qmake_pch.obj +qsystemlibrary.obj: $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp + $(QTOBJS): qmake_pch.obj qmake_pch.obj: diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index e52b8c6..f313f9e 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -79,6 +79,7 @@ QTOBJS= \ qutfcodec.o \ qstring.o \ qstringlist.o \ + qsystemlibrary.o \ qtextstream.o \ quuid.o \ qvector.o \ @@ -234,6 +235,9 @@ qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp +qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index e4e2e6a..af54288 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -79,6 +79,7 @@ QTOBJS= \ qutfcodec.o \ qstring.o \ qstringlist.o \ + qsystemlibrary.o \ qtextstream.o \ quuid.o \ qvector.o \ @@ -233,6 +234,9 @@ qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp +qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index cf6bd13..0b0033a 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -272,7 +272,8 @@ void SymbianMakefileGenerator::init() project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS")); project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE")); - // bld.inf + // Disallow renaming of bld.inf. + project->values("MAKEFILE").clear(); project->values("MAKEFILE") += BLD_INF_FILENAME; // .mmp diff --git a/qmake/qmake.pri b/qmake/qmake.pri index a7e0ab1..36c5d36 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -132,7 +132,8 @@ bootstrap { #Qt code LIBS += -framework ApplicationServices } } else:win32 { - SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp + SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp \ + qsystemlibrary.cpp win32-msvc*:LIBS += ole32.lib advapi32.lib win32-g++*:LIBS += -lole32 -luuid } |