aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2015-09-30 12:50:14 -0400
committerKen Moore <moorekou@gmail.com>2015-09-30 12:50:14 -0400
commita8a78df82af9316ca583307714adabbde86728dc (patch)
tree609daf505f87a59a5cbd92cbe3b3a60d9b53231c
parentAnother fix for the overall project file and remove a (local/testing) file fr... (diff)
downloadlumina-a8a78df82af9316ca583307714adabbde86728dc.tar.gz
lumina-a8a78df82af9316ca583307714adabbde86728dc.tar.bz2
lumina-a8a78df82af9316ca583307714adabbde86728dc.zip
Revert the debug/release flag change to all the *.pro files. This causes issues when trying to install the debug version of apps. Instead, the makefiles should be generated with the command "qmake[-qt5] CONFIG+=debug". That will set the debug flag for the Makefile and allow the user to run make and "make install" normally (but with debugging enabled)
-rw-r--r--.gitignore3
-rw-r--r--libLumina/libLumina.pro2
-rw-r--r--lumina-config/lumina-config.pro2
-rw-r--r--lumina-desktop/lumina-desktop.pro2
-rw-r--r--lumina-fileinfo/lumina-fileinfo.pro2
-rw-r--r--lumina-fm/lumina-fm.pro2
-rw-r--r--lumina-info/lumina-info.pro2
-rw-r--r--lumina-open/lumina-open.pro2
-rw-r--r--lumina-screenshot/lumina-screenshot.pro2
-rw-r--r--lumina-search/lumina-search.pro2
-rw-r--r--lumina-wm-INCOMPLETE/lumina-wm.pro1
-rw-r--r--lumina-xconfig/lumina-xconfig.pro1
-rw-r--r--lumina.pro3
13 files changed, 12 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index de3d9972..17aed4f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
global.h
*.qm
-Makefile
+Makefile.Debug
+Makefile.Release
*.o
moc_*.cpp
ui_*.h
diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro
index 4510464a..6fe81676 100644
--- a/libLumina/libLumina.pro
+++ b/libLumina/libLumina.pro
@@ -1,7 +1,7 @@
QT += core network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia
-CONFIG += debug_and_release
+
TARGET=LuminaUtils
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro
index e278cab9..df0d6417 100644
--- a/lumina-config/lumina-config.pro
+++ b/lumina-config/lumina-config.pro
@@ -1,7 +1,7 @@
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network
-CONFIG += debug_and_release
+
TARGET = lumina-config
isEmpty(PREFIX) {
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index 33fcc527..35643295 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -1,7 +1,7 @@
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia quickwidgets
-CONFIG += debug_and_release
+
TARGET = Lumina-DE
isEmpty(PREFIX) {
diff --git a/lumina-fileinfo/lumina-fileinfo.pro b/lumina-fileinfo/lumina-fileinfo.pro
index ccfa4775..34e01717 100644
--- a/lumina-fileinfo/lumina-fileinfo.pro
+++ b/lumina-fileinfo/lumina-fileinfo.pro
@@ -1,6 +1,6 @@
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent
-CONFIG += debug_and_release
+
TARGET = lumina-fileinfo
TEMPLATE = app
diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro
index 196c5c0c..1c71733e 100644
--- a/lumina-fm/lumina-fm.pro
+++ b/lumina-fm/lumina-fm.pro
@@ -1,7 +1,7 @@
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets multimedia multimediawidgets network
-CONFIG += debug_and_release
+
TARGET = lumina-fm
isEmpty(PREFIX) {
diff --git a/lumina-info/lumina-info.pro b/lumina-info/lumina-info.pro
index f5ea1058..af9b253e 100644
--- a/lumina-info/lumina-info.pro
+++ b/lumina-info/lumina-info.pro
@@ -1,6 +1,6 @@
QT += core gui widgets network
-CONFIG += debug_and_release
+
TARGET = lumina-info
isEmpty(PREFIX) {
diff --git a/lumina-open/lumina-open.pro b/lumina-open/lumina-open.pro
index 8360d3a0..f7c409f2 100644
--- a/lumina-open/lumina-open.pro
+++ b/lumina-open/lumina-open.pro
@@ -1,7 +1,7 @@
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras
-CONFIG += debug_and_release
+
TARGET = lumina-open
isEmpty(PREFIX) {
diff --git a/lumina-screenshot/lumina-screenshot.pro b/lumina-screenshot/lumina-screenshot.pro
index d6430d4f..a59f5a7d 100644
--- a/lumina-screenshot/lumina-screenshot.pro
+++ b/lumina-screenshot/lumina-screenshot.pro
@@ -1,7 +1,7 @@
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras
-CONFIG += debug_and_release
+
TARGET = lumina-screenshot
isEmpty(PREFIX) {
diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro
index f5da1fe8..65d195d5 100644
--- a/lumina-search/lumina-search.pro
+++ b/lumina-search/lumina-search.pro
@@ -1,7 +1,7 @@
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-CONFIG += debug_and_release
+
TARGET = lumina-search
isEmpty(PREFIX) {
diff --git a/lumina-wm-INCOMPLETE/lumina-wm.pro b/lumina-wm-INCOMPLETE/lumina-wm.pro
index f7370055..bba49cdc 100644
--- a/lumina-wm-INCOMPLETE/lumina-wm.pro
+++ b/lumina-wm-INCOMPLETE/lumina-wm.pro
@@ -1,7 +1,6 @@
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras
-CONFIG += debug_and_release
TARGET = lumina-wm
isEmpty(PREFIX) {
diff --git a/lumina-xconfig/lumina-xconfig.pro b/lumina-xconfig/lumina-xconfig.pro
index efa3e636..bc050966 100644
--- a/lumina-xconfig/lumina-xconfig.pro
+++ b/lumina-xconfig/lumina-xconfig.pro
@@ -13,7 +13,6 @@ isEmpty(LIBPREFIX) {
}
TEMPLATE = app
-CONFIG += debug_and_release
SOURCES += main.cpp \
mainUI.cpp
diff --git a/lumina.pro b/lumina.pro
index b5ba1552..717b71ba 100644
--- a/lumina.pro
+++ b/lumina.pro
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
-#Ensure the order listed below is preserved
-CONFIG += ordered debug_and_release
+CONFIG += recursive
SUBDIRS+= libLumina \
lumina-desktop \
bgstack15