diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
| commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
| tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /tools/configure/Makefile.win32 | |
| parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
| parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'tools/configure/Makefile.win32')
| -rw-r--r-- | tools/configure/Makefile.win32 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index 5b0a21a669..17c2d1089c 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -67,7 +67,6 @@ OBJECTS = \ qxmlstream.obj \ qxmlutils.obj \ quuid.obj \ - qcryptographichash.obj \ registry.obj \ configure_pch.obj @@ -142,7 +141,6 @@ qmalloc.obj: $(CORESRC)\global\qmalloc.cpp $(PCH) qxmlstream.obj: $(CORESRC)\xml\qxmlstream.cpp $(PCH) qxmlutils.obj: $(CORESRC)\xml\qxmlutils.cpp $(PCH) quuid.obj: $(CORESRC)\plugin\quuid.cpp $(PCH) -qcryptographichash.obj: $(CORESRC)\tools\qcryptographichash.cpp $(PCH) {$(CONFSRC)}.cpp{}.obj:: $(CXX) -c $(CXXFLAGS) $< |