remove dependency of version.h. add runtime version string functions

zhy282289 · Mar 14, 2013 · d4c51d5 · d4c51d5
1 parent 9acdb11
commit d4c51d5
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 8 deletions.
diff --git a/examples/player-d2d/main.cpp b/examples/player-d2d/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
         return 0;
     }
     renderer.show();
-    renderer.setWindowTitle("QtAV " QTAV_VERSION_STR_LONG " [email protected]");
+    renderer.setWindowTitle("QtAV " + QtAV_Version_String_Long() + " [email protected]");
     //renderer.resize(800, 600);
     QString fileName;
 	if (argc > 1)

diff --git a/examples/player-gdi/main.cpp b/examples/player-gdi/main.cpp
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 */
     GDIRenderer renderer;
     renderer.show();
-    renderer.setWindowTitle("QtAV " QTAV_VERSION_STR_LONG " [email protected]");
+    renderer.setWindowTitle("QtAV " + QtAV_Version_String_Long() + " [email protected]");
     //renderer.resize(800, 600);
     QString fileName;
 	if (argc > 1)

diff --git a/examples/player-gl/main.cpp b/examples/player-gl/main.cpp
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 
     GLWidgetRenderer renderer;
     renderer.show();
-    renderer.setWindowTitle("QtAV " QTAV_VERSION_STR_LONG " [email protected]");
+    renderer.setWindowTitle("QtAV " + QtAV_Version_String_Long() + " [email protected]");
     //renderer.resize(800, 600);
     QString fileName;
 	if (argc > 1)

diff --git a/examples/simpleplayer/main.cpp b/examples/simpleplayer/main.cpp
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
     vo = vo.toLower();
     if (vo != "gl" && vo != "d2d" && vo != "gdi")
         vo = "qpainter";
-    QString title = "QtAV " + vo + " " QTAV_VERSION_STR_LONG " [email protected]";
+    QString title = "QtAV " + vo + " " + QtAV_Version_String_Long() + " [email protected]";
     VideoRenderer *renderer = 0;
     if (vo == "gl") {
         GLWidgetRenderer *r = static_cast<GLWidgetRenderer*>(VideoRendererFactory::create(VideoRendererId_GLWidget));

diff --git a/src/QtAV/QtAV_Global.h b/src/QtAV/QtAV_Global.h
@@ -25,7 +25,6 @@
 
 #include <qglobal.h>
 #include <dptr.h>
-#include "QtAV/version.h"
 
 #if defined(Q_DLL_LIBRARY)
 #  undef Q_EXPORT
@@ -37,7 +36,8 @@
 
 /* runtime version. used to compare with compile time version */
 Q_EXPORT unsigned QtAV_Version();
-
+Q_EXPORT QString QtAV_Version_String();
+Q_EXPORT QString QtAV_Version_String_Long();
 
 // default network timeout in ms
 #define QTAV_DEFAULT_NETWORK_TIMEOUT 30000

diff --git a/src/QtAV_Compat.cpp b/src/QtAV_Compat.cpp
@@ -20,6 +20,7 @@
 ******************************************************************************/
 
 #include <QtAV/QtAV_Compat.h>
+#include "QtAV/version.h"
 #include "prepost.h"
 
 void ffmpeg_version_print()

diff --git a/src/QtAV_Global.cpp b/src/QtAV_Global.cpp
@@ -22,12 +22,23 @@
 #include <QtAV/QtAV_Global.h>
 #include <QtCore/QObject>
 #include <QtCore/QRegExp>
+#include "QtAV/version.h"
 
 unsigned QtAV_Version()
 {
     return QTAV_VERSION;
 }
 
+QString QtAV_Version_String()
+{
+    return QTAV_VERSION_STR;
+}
+
+QString QtAV_Version_String_Long()
+{
+    return QTAV_VERSION_STR_LONG;
+}
+
 namespace QtAV {
 
 QString aboutQtAV()

diff --git a/tests/clockcontrol/widget.cpp b/tests/clockcontrol/widget.cpp
@@ -32,7 +32,7 @@ using namespace QtAV;
 Widget::Widget(QWidget *parent) :
     QWidget(parent)
 {
-    setWindowTitle("A test for [clock controlling]. QtAV" QTAV_VERSION_STR_LONG " [email protected]");
+    setWindowTitle("A test for [clock controlling]. QtAV" + QtAV_Version_String_Long() + " [email protected]");
     clock = new AVClock(this);
     clock->setClockType(AVClock::ExternalClock);
     QVBoxLayout *main_layout = new QVBoxLayout;

diff --git a/tests/sharedoutput/widget.cpp b/tests/sharedoutput/widget.cpp
@@ -58,7 +58,7 @@ using namespace QtAV;
 Widget::Widget(QWidget *parent) :
     QWidget(parent)
 {
-    setWindowTitle("A test for shared video renderer. QtAV" QTAV_VERSION_STR_LONG " [email protected]");
+    setWindowTitle("A test for shared video renderer. QtAV" + QtAV_Version_String_Long() + " [email protected]");
     QVBoxLayout *main_layout = new QVBoxLayout;
     QHBoxLayout *btn_layout = new QHBoxLayout;
     renderer = new WidgetRenderer;