diff --git a/examples/DAC/DAC.pro b/examples/DAC/DAC.pro --- a/examples/DAC/DAC.pro +++ b/examples/DAC/DAC.pro @@ -4,10 +4,10 @@ DEFINES += CPUFREQ=40000000 LIBS += -ldac -eval(UCMODEL = simulator) { +contains( UCMODEL , simulator ) { BSP = SIMULATOR } -eval(UCMODEL = stm32f4) { +contains( UCMODEL , stm32f4 ) { BSP = STM32F4Eval } diff --git a/examples/PWM/PWM.pro b/examples/PWM/PWM.pro --- a/examples/PWM/PWM.pro +++ b/examples/PWM/PWM.pro @@ -1,9 +1,9 @@ TEMPLATE = app -eval(UCMODEL = simulator) { +contains( UCMODEL , simulator ) { BSP = SIMULATOR } -eval(UCMODEL = stm32f4) { +contains( UCMODEL , stm32f4 ) { BSP = STM32F4Eval } diff --git a/examples/helloWorld/helloWorld.pro b/examples/helloWorld/helloWorld.pro --- a/examples/helloWorld/helloWorld.pro +++ b/examples/helloWorld/helloWorld.pro @@ -1,9 +1,9 @@ TEMPLATE = app -eval(UCMODEL = simulator) { +contains( UCMODEL , simulator ) { BSP = SIMULATOR } -eval(UCMODEL = stm32f4) { +contains( UCMODEL , stm32f4 ) { BSP = STM32F4Eval } diff --git a/mkspecs/features/stm32f4/qmake.conf b/mkspecs/features/stm32f4/qmake.conf --- a/mkspecs/features/stm32f4/qmake.conf +++ b/mkspecs/features/stm32f4/qmake.conf @@ -57,6 +57,10 @@ contains( TEMPLATE, app ) { stflash.target = stflash stflash.commands = cd $$DESTDIR && st-flash write $(QMAKE_TARGET).bin 0x08000000 + stflash.depends = $$DESTDIR/$(QMAKE_TARGET) + qstlink2.target = qstlink2 + qstlink2.commands = cd $$DESTDIR && qstlink2 --cli --write --verify --reset ./$(QMAKE_TARGET).bin + qstlink2.depends = $$DESTDIR/$(QMAKE_TARGET) dfu_file.target = $$DESTDIR/$(QMAKE_TARGET).dfu dfu_file.commands = python $$[QT_INSTALL_BINS]/dfu.py -b 0x08000000:$$DESTDIR/$(QMAKE_TARGET).bin $$DESTDIR/$(QMAKE_TARGET).dfu dfu_file.depends = $$DESTDIR/$(QMAKE_TARGET) @@ -69,7 +73,7 @@ contains( TEMPLATE, app ) { nemiver.target = nemiver nemiver.commands = cd $$DESTDIR && nemiver --remote=localhost:3333 --gdb-binary=`which arm-none-eabi-gdb` $(QMAKE_TARGET) nemiver.depends = gdb-server - QMAKE_EXTRA_TARGETS += dfu_file stflash dfu nemiver gdb-server + QMAKE_EXTRA_TARGETS += dfu_file stflash dfu nemiver gdb-server qstlink2 }