Commit 7d241eea authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed call to QCoreApplication::setAttribute(Qt::AA_X11InitThreads).

parent 31652ad7
......@@ -34,6 +34,9 @@ using namespace campvis;
* \return 0 if program exited successfully
**/
int main(int argc, char** argv) {
// Make Xlib and GLX thread safe under X11
QCoreApplication::setAttribute(Qt::AA_X11InitThreads);
CampVisApplication app(argc, argv);
app.init();
int toReturn = app.run();
......
......@@ -72,9 +72,6 @@ namespace campvis {
, _argc(argc)
, _argv(argv)
{
// Make Xlib and GLX thread safe under X11
QApplication::setAttribute(Qt::AA_X11InitThreads);
}
CampVisApplication::~CampVisApplication() {
......
......@@ -80,10 +80,9 @@ void deinit() {
GTEST_API_ int main(int argc, char **argv) {
printf("Running main() from main.cpp\n");
app = new QApplication(argc, argv);
// Make Xlib and GLX thread safe under X11
QApplication::setAttribute(Qt::AA_X11InitThreads);
QCoreApplication::setAttribute(Qt::AA_X11InitThreads);
app = new QApplication(argc, argv);
testing::InitGoogleTest(&argc, argv);
init();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment