Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
David Cazier
CGoGN
Commits
c8efe8e3
Commit
c8efe8e3
authored
Mar 19, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve bug of menu on mac/Qt5
parent
c32ed9f5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
4 deletions
+21
-4
Apps/CMakeLists.txt
Apps/CMakeLists.txt
+5
-1
CMakeLists.txt
CMakeLists.txt
+5
-0
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+5
-1
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+6
-2
No files found.
Apps/CMakeLists.txt
View file @
c8efe8e3
...
...
@@ -19,7 +19,11 @@ IF (WIN32)
ENDIF
()
ELSE
()
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
SET
(
EXECUTABLE_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
IF
(
APPLE
)
SET
(
EXECUTABLE_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
/Contents/MacOS/
)
ELSE
()
SET
(
EXECUTABLE_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
ENDIF
()
#include_directories(
...
...
CMakeLists.txt
View file @
c8efe8e3
...
...
@@ -171,6 +171,11 @@ IF(WIN32)
LIST
(
APPEND CGoGN_DEFS -D_USE_MATH_DEFINES
)
ENDIF
()
IF
(
APPLE
)
LIST
(
APPEND CGoGN_DEFS -DCGOGN_APPLE
)
ENDIF
()
IF
(
CGoGN_GCC_4_9
)
LIST
(
APPEND CGoGN_DEFS -DCGOGN_GCC_4_9
)
ENDIF
()
...
...
SCHNApps/CMakeLists.txt
View file @
c8efe8e3
...
...
@@ -32,7 +32,11 @@ IF(WIN32)
link_directories
(
${
CGoGN_ROOT_DIR
}
/bin/
${
ConfigurationName
}
)
ENDIF
()
ELSE
()
SET
(
EXECUTABLE_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
IF
(
APPLE
)
SET
(
EXECUTABLE_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
/Contents/MacOS/
)
ELSE
()
SET
(
EXECUTABLE_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
# SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
...
...
SCHNApps/src/schnapps.cpp
View file @
c8efe8e3
...
...
@@ -385,7 +385,7 @@ Plugin* SCHNApps::enablePlugin(const QString& pluginName)
statusbar
->
showMessage
(
pluginName
+
QString
(
" successfully loaded."
),
2000
);
DEBUG_EMIT
(
"pluginEnabled"
);
emit
(
pluginEnabled
(
plugin
));
// menubar->repaint();
// method success
return
plugin
;
}
...
...
@@ -692,7 +692,11 @@ void SCHNApps::addMenuAction(Plugin* plugin, const QString& menuPath, QAction* a
}
}
}
// just for update the menu in buggy Qt5 on macOS
#if (defined CGOGN_APPLE) && ((QT_VERSION>>16) == 5)
QMenu
*
fakemenu
=
menuBar
()
->
addMenu
(
"X"
);
delete
fakemenu
;
#endif
m_pluginMenuActions
[
plugin
].
append
(
action
);
}
}
...
...
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