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.mingw | |
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.mingw')
-rw-r--r-- | tools/configure/Makefile.mingw | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw index 086dd71a85..ce923db5bc 100644 --- a/tools/configure/Makefile.mingw +++ b/tools/configure/Makefile.mingw @@ -36,6 +36,7 @@ OBJECTS = \ qdatastream.o \ qdir.o \ qdiriterator.o \ + qfiledevice.o \ qfile.o \ qfileinfo.o \ qabstractfileengine.o \ |