[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gluon] /
From: Laszlo Papp <djszapi () archlinux ! us>
Date: 2011-01-23 21:46:38
Message-ID: 20110123214638.DA45CA6092 () git ! kde ! org
[Download RAW message or body]
Git commit f00aa48a620b00312955388f82989aea7d603213 by Laszlo Papp.
Pushed by lpapp into branch 'master'.
Add windows build files to the input CMakeLists.txt
M +1 -3 creator/lib/dockmanager.cpp
M +20 -10 input/CMakeLists.txt
http://commits.kde.org/fad2ae7b/f00aa48a620b00312955388f82989aea7d603213
diff --git a/creator/lib/dockmanager.cpp b/creator/lib/dockmanager.cpp
index 9a41b91..5639848 100644
--- a/creator/lib/dockmanager.cpp
+++ b/creator/lib/dockmanager.cpp
@@ -54,7 +54,7 @@ void DockManager::removeDock( QDockWidget* dock )
void DockManager::setDocksEnabled( bool enabled )
{
- foreach( QDockWidget * dock, d->docks )
+ foreach( QDockWidget* dock, d->docks )
{
dock->setEnabled( enabled );
}
@@ -95,5 +95,3 @@ DockManager::~DockManager()
{
delete d;
}
-
-//#include "dockmanager.moc"
diff --git a/input/CMakeLists.txt b/input/CMakeLists.txt
index 7d4f507..2712cc7 100644
--- a/input/CMakeLists.txt
+++ b/input/CMakeLists.txt
@@ -29,6 +29,7 @@ if(APPLE)
message("-- Found CoreFoundation:" ${COREFOUNDATION_LIBRARY})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mac/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qt/)
elseif(WIN32)
set(GLUON_INPUT_INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}
@@ -37,6 +38,7 @@ elseif(WIN32)
CACHE PATHS "Includes required for Gluon Input"
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qt/)
elseif(UNIX)
set(GLUON_INPUT_INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}
@@ -45,14 +47,22 @@ elseif(UNIX)
CACHE PATHS "Includes required for Gluon Input"
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qt/)
endif()
-set(GLUON_INPUT_INCLUDES ${GLUON_INPUT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/qt)
-
###############win source and headers###################
-set(GluonInput_SRCS_WIN )
+set(GluonInput_SRCS_WIN
+ windows/detectwin.cpp
+ windows/gluonbuttons.cpp
+ windows/inputthread.cpp
+)
-set(GluonInput_HEADERS_WIN )
+set(GluonInput_HEADERS_WIN
+ windows/detectwin.h
+ windows/inputthread.h
+ windows/gluonbuttons.h
+ windows/gluondevices.h
+)
###############win source and headers###################
###############mac source and headers###################
@@ -234,10 +244,10 @@ elseif(UNIX)
else()
endif()
- install(
- FILES
- ${GluonInput_HEADERS_QT}
- ${GluonInput_HEADERS_COMMON}
- DESTINATION ${INCLUDE_INSTALL_DIR}/gluon/qt
- COMPONENT Devel
+install(
+ FILES
+ ${GluonInput_HEADERS_QT}
+ ${GluonInput_HEADERS_COMMON}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/gluon/qt
+ COMPONENT Devel
)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic