[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 06/09: gr-qtgui: Re-introduce some Qt4-spec
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 06/09: gr-qtgui: Re-introduce some Qt4-specific code |
|
Date: |
Wed, 22 Jun 2016 21:19:31 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit 00939e923112a4792398f3065d55754b38e76146
Author: Paul Cercueil <address@hidden>
Date: Tue Jun 21 18:30:21 2016 +0200
gr-qtgui: Re-introduce some Qt4-specific code
Signed-off-by: Paul Cercueil <address@hidden>
---
gr-qtgui/lib/const_sink_c_impl.cc | 4 ++++
gr-qtgui/lib/freq_sink_c_impl.cc | 4 ++++
gr-qtgui/lib/freq_sink_f_impl.cc | 4 ++++
gr-qtgui/lib/histogram_sink_f_impl.cc | 4 ++++
gr-qtgui/lib/sink_c_impl.cc | 4 ++++
gr-qtgui/lib/sink_f_impl.cc | 4 ++++
gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 ++++
gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 ++++
gr-qtgui/lib/time_sink_c_impl.cc | 4 ++++
gr-qtgui/lib/time_sink_f_impl.cc | 4 ++++
gr-qtgui/lib/vector_sink_f_impl.cc | 4 ++++
gr-qtgui/lib/waterfall_sink_c_impl.cc | 4 ++++
gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 ++++
13 files changed, 52 insertions(+)
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc
b/gr-qtgui/lib/const_sink_c_impl.cc
index 02e7002..7aa99a1 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -128,6 +128,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 6499e61..544c8b3 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -154,6 +154,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index 3a9fefc..816b374 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -153,6 +153,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc
b/gr-qtgui/lib/histogram_sink_f_impl.cc
index e1595bb..376f50a 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -115,6 +115,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
index 31186fc..14ddde8 100644
--- a/gr-qtgui/lib/sink_c_impl.cc
+++ b/gr-qtgui/lib/sink_c_impl.cc
@@ -130,6 +130,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
index 7d03fa2..e60e98a 100644
--- a/gr-qtgui/lib/sink_f_impl.cc
+++ b/gr-qtgui/lib/sink_f_impl.cc
@@ -130,6 +130,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc
b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index c1e1d10..7b252a4 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -130,6 +130,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc
b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index c61cc59..0e4cb1d 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -128,6 +128,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 0eb51e0..ff663ca 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -129,6 +129,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index fab7437..28bbb44 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -126,6 +126,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc
b/gr-qtgui/lib/vector_sink_f_impl.cc
index 6b1e387..bafd1b7 100644
--- a/gr-qtgui/lib/vector_sink_f_impl.cc
+++ b/gr-qtgui/lib/vector_sink_f_impl.cc
@@ -139,6 +139,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc
b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index f958976..d3ca347 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -154,6 +154,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc
b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index 1a0d99a..4b062de 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -154,6 +154,10 @@ namespace gr {
d_qApplication = qApp;
}
else {
+#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000
+ std::string style = prefs::singleton()->get_string("qtgui", "style",
"raster");
+ QApplication::setGraphicsSystem(QString(style.c_str()));
+#endif
d_qApplication = new QApplication(d_argc, &d_argv);
}
- [Commit-gnuradio] [gnuradio] branch next-qt5 updated (3c14957 -> cc57ff6), git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 03/09: cmake: FindQwt: Find the Qwt library that matches the Qt version, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 05/09: gr-qtgui: Fix range.py to work with both Qt4 and Qt5, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 09/09: Merge branch 'adi-qt5' into next-qt5, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 06/09: gr-qtgui: Re-introduce some Qt4-specific code,
git <=
- [Commit-gnuradio] [gnuradio] 07/09: grc: Fix generation of Python code for Qt4 and Qt5, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 01/09: Revert "CMake: Remove obsolete GrSetupQt4 module", git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 04/09: gr-qtgui: Fix PyQt[4, 5] include in XMLs for GRC, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 08/09: qtgui: tolerate return of NoneType when setting not found, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 02/09: gr-qtgui: Allow build with Qt4 or Qt5 (default), git, 2016/06/22