summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-09-30 16:06:36 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-10-04 08:25:08 +0000
commit5a4d469dcba9a2f843d9763f2966aad7c22a6b3d (patch)
tree777958177e102e37a9c0e1fdd99859bfa54ab247 /tools
parent9e048799b830045715c4434ec02b8a7a89fd4d97 (diff)
rename configure.exe => configureapp.exe
now that the bat file is responsible for displaying the help in addition to bootstrapping configure, the exe file should not shadow it any more. amends c027cffbe. Change-Id: I5c8a52f59ff455575e646fae55cd214db98a3736 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/Makefile.mingw2
-rw-r--r--tools/configure/Makefile.win322
-rw-r--r--tools/configure/configure.pro2
3 files changed, 3 insertions, 3 deletions
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