diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-18 18:17:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-12-08 12:40:53 +0000 |
| commit | e2978d6097be2313e49c57ec14618033cbfa7414 (patch) | |
| tree | b9ccc2e78f1869ed0d94c6569649c7de1488719b /tools/configure/Makefile.mingw | |
| parent | f882d2f443a8950a2f784fa91b3ff10a645577f7 (diff) | |
move license check to qmake-based configure system
this also removes the need for passing pre-processed options via
configure.cfg, so get rid of that.
a somewhat unfortunate side effect is that the android-style-assets
feature had to move back to the top level, as the licensing options
depend on it.
Started-by: Lars Knoll <lars.knoll@qt.io>
Change-Id: Id4d1e0ba18b3e3104400293b8f0c7f2f65e68dea
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tools/configure/Makefile.mingw')
| -rw-r--r-- | tools/configure/Makefile.mingw | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw index ff960115f9..b61dc38de4 100644 --- a/tools/configure/Makefile.mingw +++ b/tools/configure/Makefile.mingw @@ -18,7 +18,6 @@ OBJECTS = \ main.o \ configureapp.o \ environment.o \ - tools.o \ qarraydata.o \ qbytearray.o \ qbytearraymatcher.o \ @@ -116,9 +115,8 @@ $(PCH): $(CONFSRC)/configure_pch.h VPATH = $(CONFSRC):$(TOOLSRC)/shared/windows:$(CORESRC)/global:$(CORESRC)/kernel:$(CORESRC)/tools:$(CORESRC)/codecs:$(CORESRC)/io:$(CORESRC)/xml:$(CORESRC)/plugin main.o: $(CONFSRC)/configureapp.h -configureapp.o: $(CONFSRC)/configureapp.h $(CONFSRC)/environment.h $(CONFSRC)/tools.h +configureapp.o: $(CONFSRC)/configureapp.h $(CONFSRC)/environment.h environment.o: $(CONFSRC)/environment.h -tools.o: $(CONFSRC)/tools.h # Make sure qstring_compat.obj isn't compiled with PCH enabled qstring_compat.o: $(CORESRC)/tools/qstring_compat.cpp |