diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
| commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
| tree | 8336143e8c09810dc97324970fed61af27e26a97 /tools/configure/Makefile.win32 | |
| parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
| parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) | |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'tools/configure/Makefile.win32')
| -rw-r--r-- | tools/configure/Makefile.win32 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index 92de55f137..57fe6726c2 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -34,6 +34,7 @@ OBJECTS = \ qdatastream.obj \ qdir.obj \ qdiriterator.obj \ + qfiledevice.obj \ qfile.obj \ qfileinfo.obj \ qabstractfileengine.obj \ @@ -65,7 +66,8 @@ OBJECTS = \ qxmlutils.obj \ quuid.obj \ qcryptographichash.obj \ - registry.obj + registry.obj \ + configure_pch.obj $(TARGET): $(OBJECTS) $(LINK) $(LFLAGS) /OUT:$(TARGET) @<< @@ -102,6 +104,7 @@ qbuffer.obj: $(CORESRC)\io\qbuffer.cpp $(PCH) qdatastream.obj: $(CORESRC)\io\qdatastream.cpp $(PCH) qdir.obj: $(CORESRC)\io\qdir.cpp $(PCH) qdiriterator.obj: $(CORESRC)\io\qdiriterator.cpp $(PCH) +qfiledevice.obj: $(CORESRC)\io\qfiledevice.cpp $(PCH) qfile.obj: $(CORESRC)\io\qfile.cpp $(PCH) qfileinfo.obj: $(CORESRC)\io\qfileinfo.cpp $(PCH) qabstractfileengine.obj: $(CORESRC)\io\qabstractfileengine.cpp $(PCH) |