Merge no_embedded and dev qmake CONFIG flags

harmonyqml.pro

@@ -11,19 +11,19 @@ RCC_DIR     = $$BUILD_DIR/rcc
 
 QRC_FILE = $$BUILD_DIR/resources.qrc
 
+RESOURCES += $$QRC_FILE
 SOURCES   += src/main.cpp
 TARGET     = harmonyqml
 
 
 # Custom CONFIG options
 
-!no_embedded {
-    RESOURCES += $$QRC_FILE
-}
-
 dev {
     CONFIG    -= warn_off release
     CONFIG    += debug qml_debug declarative_debug
+    RESOURCES -= $$QRC_FILE
+
+    warning(make install cannot be used with the dev CONFIG option.)
 }
 
 
@@ -33,11 +33,7 @@ win32:executables.path  = "C:/Program Files"
 !win32:executables.path = /usr/local/bin
 executables.files       = $$TARGET
 
-no_embedded {
-    warning(make install cannot be used with the no_embedded CONFIG option.)
-}
-
-!no_embedded:INSTALLS += executables
+!dev:INSTALLS += executables
 
 
 # Libraries includes

live-reload.sh

@@ -10,14 +10,12 @@
 
 export QT_QPA_PLATFORM=xcb
 
-CFG='dev no_embedded'
-
 make clean
-qmake harmonyqml.pro CONFIG+="$CFG" && make
+qmake harmonyqml.pro CONFIG+=dev && make
 
 while true; do
     find src harmonyqml.pro -type f |
     entr -cdnr sh -c \
-        "qmake harmonyqml.pro CONFIG+='$CFG' && make && ./harmonyqml $*"
+        "qmake harmonyqml.pro CONFIG+=dev && make && ./harmonyqml $*"
     sleep 0.2
 done