diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.bat | 2 | ||||
| -rw-r--r-- | tools/configure/Makefile.mingw | 2 | ||||
| -rw-r--r-- | tools/configure/Makefile.win32 | 2 | ||||
| -rw-r--r-- | tools/configure/configure.pro | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 8d73829def..a1079a33c6 100644 --- a/.gitignore +++ b/.gitignore @@ -202,7 +202,7 @@ src/3rdparty/webkit/includes2.txt # generated files in configure.exe bootstrapping tools/configure/configure.intermediate.manifest tools/configure/configure_pch.pch -/configure.exe +/configureapp.exe # Symlinks generated by configure tools/qvfb/qvfbhdr.h diff --git a/configure.bat b/configure.bat index 769cddbd1b..385b1e3556 100644 --- a/configure.bat +++ b/configure.bat @@ -130,7 +130,7 @@ if errorlevel 1 (cd ..\.. & exit /b 1) cd ..\.. :conf -configure.exe -srcdir %QTSRC% %ARGS% +configureapp.exe -srcdir %QTSRC% %ARGS% goto exit :help diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw index ed13c1a776..bdf5758b61 100644 --- a/tools/configure/Makefile.mingw +++ b/tools/configure/Makefile.mingw @@ -12,7 +12,7 @@ LINK = g++ LFLAGS = -Wl,-subsystem,console -mthreads LIBS = -lole32 -ladvapi32 -luuid -TARGET = ../../configure.exe +TARGET = ../../configureapp.exe OBJECTS = \ main.o \ diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index aae3d57ce3..94cc074730 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -17,7 +17,7 @@ LINK = link LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO /SUBSYSTEM:CONSOLE "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /MANIFEST /MANIFESTFILE:"configure.intermediate.manifest" LIBS = ole32.lib advapi32.lib shell32.lib -TARGET = ..\..\configure.exe +TARGET = ..\..\configureapp.exe OBJECTS = \ main.obj \ diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index f1767e16cd..5a42a4be95 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -1,4 +1,4 @@ -TARGET = configure +TARGET = configureapp DESTDIR = $$PWD/../.. # build directly in source dir CONFIG += console flat stl rtti_off |