move "shared" registry reading code into qmake

now that configureapp does not use it any more, qmake is the only
remaining user. and the license headers already claimed that this code
is part of qmake ...

Change-Id: I9b8a16f8f2b432d2b1143efbdd1f0042305ccc0c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

7 files changed, 7 insertions, 12 deletions

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index aa6c876c73..72431f51ea 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -33,6 +33,7 @@ DEPEND_SRC = \
 	   $(QMKGENSRC)/projectgenerator.cpp $(QMKGENSRC)/makefile.cpp \
 	   $(QMKGENSRC)/unix/unixmake.cpp $(QMKGENSRC)/unix/unixmake2.cpp \
 	   $(QMKGENSRC)/mac/pbuilder_pbx.cpp \
+	   $(QMKGENSRC)/win32/registry.cpp \
 	   $(QMKGENSRC)/win32/winmakefile.cpp \
 	   $(QMKGENSRC)/win32/mingw_make.cpp $(QMKGENSRC)/win32/msvc_nmake.cpp \
 	   $(QMKGENSRC)/mac/xmloutput.cpp \
@@ -84,7 +85,6 @@ DEPEND_SRC = \
 	   $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
 	   $(SOURCE_PATH)/src/corelib/global/qlogging.cpp \
 	   $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp \
-	   $(SOURCE_PATH)/tools/shared/windows/registry.cpp \
 	   $(SOURCE_PATH)/src/corelib/json/qjson.cpp \
 	   $(SOURCE_PATH)/src/corelib/json/qjsondocument.cpp \
 	   $(SOURCE_PATH)/src/corelib/json/qjsonparser.cpp \
@@ -100,7 +100,6 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
 	   -I$(INC_PATH)/QtCore/$(QT_VERSION) -I$(INC_PATH)/QtCore/$(QT_VERSION)/QtCore \
 	   -I$(BUILD_PATH)/src/corelib/global \
 	   -I$(QMAKESPEC) \
-	   -I$(SOURCE_PATH)/tools/shared \
 	   -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \
            -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
            -DQT_NO_FOREACH
@@ -184,6 +183,9 @@ unixmake.o: $(QMKSRC)/generators/unix/unixmake.cpp
 unixmake2.o: $(QMKSRC)/generators/unix/unixmake2.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
+registry.o: $(QMKSRC)/generators/win32/registry.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) $<
+
 winmakefile.o: $(QMKSRC)/generators/win32/winmakefile.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
@@ -404,9 +406,6 @@ qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp
 qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
 
-registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp
-
 qjson.o: $(SOURCE_PATH)/src/corelib/json/qjson.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/json/qjson.cpp
 
diff --git a/qmake/Makefile.unix.win32 b/qmake/Makefile.unix.win32
index be7245a370..14487e0dbd 100644
--- a/qmake/Makefile.unix.win32
+++ b/qmake/Makefile.unix.win32
@@ -16,4 +16,4 @@ QTSRCS = \
     $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp \
     $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp \
     $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp \
-    $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+    $(SOURCE_PATH)/qmake/generators/win32/registry.cpp
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 8e41facde2..9e1f5136ef 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -37,7 +37,6 @@ CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \
               -I$(INC_PATH) -I$(INC_PATH)\QtCore -I$(INC_PATH)\QtCore\$(QT_VERSION) -I$(INC_PATH)\QtCore\$(QT_VERSION)\QtCore \
               -I$(BUILD_PATH)\src\corelib\global \
               -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
-              -I$(SOURCE_PATH)\tools\shared \
               -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \
               -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
               -DQT_NO_FOREACH -DUNICODE
@@ -197,9 +196,6 @@ qmake_pch.obj:
 {$(SOURCE_PATH)\src\corelib\json}.cpp{}.obj::
 	$(CXX) $(CXXFLAGS) $<
 
-{$(SOURCE_PATH)\tools\shared\windows}.cpp{}.obj::
-	$(CXX) $(CXXFLAGS) $<
-
 # Make sure qstring_compat.obj isn't compiled with PCH enabled
 qstring_compat.obj: $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp
 	$(CXX) -c $(CXXFLAGS_BARE) $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index da10b1984f..5b5eecd373 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -34,7 +34,7 @@
 #include <qdiriterator.h>
 #include <qset.h>
 
-#include <windows/registry_p.h>
+#include <registry_p.h>
 
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index ae1d095629..ef4e9f29b6 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -61,7 +61,7 @@ QT_END_NAMESPACE
 
 #ifdef Q_OS_WIN32
 #include <qt_windows.h>
-#include <windows/registry_p.h>
+#include <registry_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tools/shared/windows/registry.cpp b/qmake/generators/win32/registry.cpp
index 74c912ca43..74c912ca43 100644
--- a/tools/shared/windows/registry.cpp
+++ b/qmake/generators/win32/registry.cpp
diff --git a/tools/shared/windows/registry_p.h b/qmake/generators/win32/registry_p.h
index 3526dffd45..3526dffd45 100644
--- a/tools/shared/windows/registry_p.h
+++ b/qmake/generators/win32/registry_p.h