From 557e659e153c0974fe25997253f95908fb370e4d Mon Sep 17 00:00:00 2001 From: Pieter van der Kloet Date: Mon, 2 May 2011 20:07:37 +0200 Subject: [PATCH] CMake modifications, stylesheet gets copied to destination dir now --- apps/launcher/CMakeLists.txt | 8 ++------ apps/launcher/playpage.cpp | 2 +- {apps/launcher/resources => files}/launcher.qss | 0 3 files changed, 3 insertions(+), 7 deletions(-) rename {apps/launcher/resources => files}/launcher.qss (100%) diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt index 00a50679c..2e4707c63 100644 --- a/apps/launcher/CMakeLists.txt +++ b/apps/launcher/CMakeLists.txt @@ -45,9 +45,5 @@ target_link_libraries(launcher ${QT_LIBRARIES} ) - - -#if (APPLE) -# find_library(CARBON_FRAMEWORK Carbon) -# target_link_libraries(openmw ${CARBON_FRAMEWORK}) -#endif (APPLE) +configure_file(${CMAKE_SOURCE_DIR}/files/launcher.qss + "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.qss") \ No newline at end of file diff --git a/apps/launcher/playpage.cpp b/apps/launcher/playpage.cpp index 773d2d96a..c1ba616c0 100644 --- a/apps/launcher/playpage.cpp +++ b/apps/launcher/playpage.cpp @@ -5,7 +5,7 @@ PlayPage::PlayPage(QWidget *parent) : QWidget(parent) { // Load the stylesheet - QFile file("resources/launcher.qss"); + QFile file("launcher.qss"); file.open(QFile::ReadOnly); QString styleSheet = QLatin1String(file.readAll()); diff --git a/apps/launcher/resources/launcher.qss b/files/launcher.qss similarity index 100% rename from apps/launcher/resources/launcher.qss rename to files/launcher.qss