Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenWalnut Core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
44
Issues
44
List
Boards
Labels
Service Desk
Milestones
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
960677b2
Commit
960677b2
authored
Feb 22, 2011
by
Sebastian Eichelbaum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[STYLE]
parent
e24a46eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
src/gui/qt4/CMakeLists.txt
src/gui/qt4/CMakeLists.txt
+10
-10
src/gui/qt4/controlPanel/WQtControlPanel.h
src/gui/qt4/controlPanel/WQtControlPanel.h
+1
-1
No files found.
src/gui/qt4/CMakeLists.txt
View file @
960677b2
...
...
@@ -37,7 +37,7 @@ SET(GUI_QT4_MOC_HDRS
controlPanel/WQtTextureSorter.h
)
IF
(
CMAKE_HOST_SYSTEM MATCHES Darwin
)
LIST
(
APPEND GUI_QT4_MOC_HDRS platformDependent/WQtGLWidgetMac.h
)
LIST
(
APPEND GUI_QT4_MOC_HDRS platformDependent/WQtGLWidgetMac.h
)
ELSE
()
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio"
)
...
...
@@ -51,21 +51,21 @@ QT4_WRAP_CPP(GUI_QT4_MOC_SRCS ${GUI_QT4_MOC_HDRS} )
FILE
(
GLOB GUI_QT4_SRC
"*.cpp"
"guiElements/*.cpp"
"controlPanel/*.cpp"
"ribbonMenu/*.cpp"
"events/*.cpp"
"*.h"
"guiElements/*.h"
"controlPanel/*.h"
"ribbonMenu/*.h"
"events/*.h"
"../icons/WIcons.h"
)
IF
(
CMAKE_HOST_SYSTEM MATCHES Darwin
)
FILE
(
GLOB GUIQT4_PLATFORMDEPENDENT_SRC
"platformDependent/WQtGLWidgetMac.cpp"
FILE
(
GLOB GUIQT4_PLATFORMDEPENDENT_SRC
"platformDependent/WQtGLWidgetMac.cpp"
"platformDependent/WQtGLWidgetMac.h"
)
ELSE
()
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio"
)
FILE
(
GLOB GUIQT4_PLATFORMDEPENDENT_SRC
"platformDependent/WQtGLWidgetWin.cpp"
FILE
(
GLOB GUIQT4_PLATFORMDEPENDENT_SRC
"platformDependent/WQtGLWidgetWin.cpp"
"platformDependent/WQtGLWidgetWin.h"
)
ELSE
(
CMAKE_GENERATOR MATCHES
"Visual Studio"
)
FILE
(
GLOB GUIQT4_PLATFORMDEPENDENT_SRC
"platformDependent/WQtGLWidgetAll.cpp"
FILE
(
GLOB GUIQT4_PLATFORMDEPENDENT_SRC
"platformDependent/WQtGLWidgetAll.cpp"
"platformDependent/WQtGLWidgetAll.h"
)
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio"
)
ENDIF
()
SET
(
LIB_NAME
"
${
OWguiqt4Name
}
"
)
SET
(
${
LIB_NAME
}
_COMBINER_SRC
${
GUI_QT4_SRC
}
${
GUIQT4_PLATFORMDEPENDENT_SRC
}
${
GUI_QT4_MOC_SRCS
}
)
...
...
@@ -79,14 +79,14 @@ LIST( REMOVE_ITEM ${LIB_NAME}_ALL_CPP_WITHOUT_MOC ${${LIB_NAME}_REMOVE_H} )
IF
(
OW_BUILD_AS_ONE_BIG_FILE
)
SET
(
UNITY_BUILD_FILE_NAME
"
${
LIB_NAME
}
UnityBuildFile.cpp"
)
GENERATE_UNITY_BUILD_FILE
(
${
LIB_NAME
}
_ALL_CPP
)
ADD_LIBRARY
(
${
LIB_NAME
}
${
UNITY_BUILD_FILE_NAME
}
${${
LIB_NAME
}
_COMBINER_SRC
}
)
ENDIF
(
OW_BUILD_AS_ONE_BIG_FILE
)
IF
(
NOT OW_BUILD_AS_ONE_BIG_FILE
)
ADD_LIBRARY
(
${
LIB_NAME
}
${${
LIB_NAME
}
_COMBINER_SRC
}
)
ENDIF
(
NOT OW_BUILD_AS_ONE_BIG_FILE
)
#IF( OW_BUILD_AS_ONE_BIG_FILE )
# SET( ALL_GUI_QT4_COMBINER_SRC ${GUI_QT4_SRC} ${GUIQT4_PLATFORMDEPENDENT_SRC} ${GUI_QT4_MOC_SRCS} )
# SET( UNITY_BUILD_FILE_NAME "GuiQt4UnityBuildFile.cpp" )
...
...
src/gui/qt4/controlPanel/WQtControlPanel.h
View file @
960677b2
...
...
@@ -213,7 +213,7 @@ protected:
* Searches the tree for all tree items matching the specified module.
*
* \param module the module uses as search criteria.
*
*
* \return a list of all matching items.
*/
std
::
list
<
WQtTreeItem
*
>
findItemsByModule
(
boost
::
shared_ptr
<
WModule
>
module
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment