Compare commits
	
		
			2 commits
		
	
	
		
			28087c182e
			...
			04c4cfe7e0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 04c4cfe7e0 | |||
| 63180382be | 
					 6 changed files with 12 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -17,6 +17,6 @@ qt_add_executable(quickshell
 | 
			
		|||
	panelinterface.cpp
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
qt_add_qml_module(quickshell URI Quickshell)
 | 
			
		||||
qt_add_qml_module(quickshell URI Quickshell VERSION 0.1)
 | 
			
		||||
 | 
			
		||||
target_link_libraries(quickshell PRIVATE ${QT_DEPS})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,14 +14,16 @@
 | 
			
		|||
int main(int argc, char** argv) {
 | 
			
		||||
	const auto app = QGuiApplication(argc, argv);
 | 
			
		||||
	QGuiApplication::setApplicationName("quickshell");
 | 
			
		||||
	QGuiApplication::setApplicationVersion("0.0.1");
 | 
			
		||||
	QGuiApplication::setApplicationVersion("0.1.0");
 | 
			
		||||
 | 
			
		||||
	QCommandLineParser parser;
 | 
			
		||||
	parser.addHelpOption();
 | 
			
		||||
	parser.addVersionOption();
 | 
			
		||||
 | 
			
		||||
	auto configOption = QCommandLineOption({"c", "config"}, "Path to configuration file.", "path");
 | 
			
		||||
	auto workdirOption = QCommandLineOption({"d", "workdir"}, "Initial working directory.", "path");
 | 
			
		||||
	parser.addOption(configOption);
 | 
			
		||||
	parser.addOption(workdirOption);
 | 
			
		||||
	parser.process(app);
 | 
			
		||||
 | 
			
		||||
	QString configPath;
 | 
			
		||||
| 
						 | 
				
			
			@ -39,6 +41,10 @@ int main(int argc, char** argv) {
 | 
			
		|||
		return -1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (parser.isSet(workdirOption)) {
 | 
			
		||||
		QDir::setCurrent(parser.value(workdirOption));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	QuickshellPlugin::initPlugins();
 | 
			
		||||
 | 
			
		||||
	// Base window transparency appears to be additive.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
#include "qmlglobal.hpp"
 | 
			
		||||
#include <utility>
 | 
			
		||||
 | 
			
		||||
#include <qcontainerfwd.h>
 | 
			
		||||
#include <qcoreapplication.h>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@ if (SOCKETS)
 | 
			
		|||
	target_sources(quickshell-io PRIVATE socket.cpp)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
qt_add_qml_module(quickshell-io URI Quickshell.Io)
 | 
			
		||||
qt_add_qml_module(quickshell-io URI Quickshell.Io VERSION 0.1)
 | 
			
		||||
 | 
			
		||||
target_link_libraries(quickshell-io PRIVATE ${QT_DEPS})
 | 
			
		||||
target_link_libraries(quickshell-io-init PRIVATE ${QT_DEPS})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -45,7 +45,7 @@ endfunction()
 | 
			
		|||
# -----
 | 
			
		||||
 | 
			
		||||
qt_add_library(quickshell-wayland STATIC)
 | 
			
		||||
qt_add_qml_module(quickshell-wayland URI Quickshell.Wayland)
 | 
			
		||||
qt_add_qml_module(quickshell-wayland URI Quickshell.Wayland VERSION 0.1)
 | 
			
		||||
 | 
			
		||||
# required to make sure the constructor is linked
 | 
			
		||||
add_library(quickshell-wayland-init OBJECT init.cpp)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,7 @@ qt_add_library(quickshell-wayland-layershell STATIC
 | 
			
		|||
	window.cpp
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
qt_add_qml_module(quickshell-wayland-layershell URI Quickshell.Wayland._WlrLayerShell)
 | 
			
		||||
qt_add_qml_module(quickshell-wayland-layershell URI Quickshell.Wayland._WlrLayerShell VERSION 0.1)
 | 
			
		||||
 | 
			
		||||
wl_proto(quickshell-wayland-layershell wlr-layer-shell-unstable-v1 "${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml")
 | 
			
		||||
target_link_libraries(quickshell-wayland-layershell PRIVATE ${QT_DEPS} wayland-client)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue