[X2Go-Commits] [x2goclient] 03/10: general: rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and reference in x2goclient.pro.

git-admin at x2go.org git-admin at x2go.org
Fri Feb 13 22:13:42 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 503db1ba08f07e17543c78428d79635d28333e53
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 13 21:09:38 2015 +0100

    general: rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and reference in x2goclient.pro.
---
 debian/changelog                                   |    2 ++
 .../src/qtbrowserplugin.cpp                        |    0
 .../src/qtbrowserplugin.def                        |    0
 .../src/qtbrowserplugin.h                          |    0
 .../src/qtbrowserplugin.pri                        |    0
 .../src/qtbrowserplugin_mac.cpp                    |    0
 .../src/qtbrowserplugin_p.h                        |    0
 .../src/qtbrowserplugin_win.cpp                    |    0
 .../src/qtbrowserplugin_x11.cpp                    |    0
 .../src/qtbrowserpluginax.def                      |    0
 .../src/qtnpapi.h                                  |    0
 x2goclient.pro                                     |    6 +++---
 12 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aee2e70..e6ab718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -101,6 +101,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Move resource files to src/res/ and reference in x2goclient.pro.
     - Reference changes in shipped Makefile.
     - Rename SRC_DIR to TOP_DIR in shipped Makefile.
+    - Rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and
+      reference in x2goclient.pro.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.cpp
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.def b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.def
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.def
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.def
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.h b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.h
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.h
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.h
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_mac.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_mac.cpp
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_mac.cpp
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_mac.cpp
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_p.h b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_p.h
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_p.h
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_p.h
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_win.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_win.cpp
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_win.cpp
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_win.cpp
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_x11.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_x11.cpp
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_x11.cpp
rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_x11.cpp
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserpluginax.def b/x2gobrowserplugin-2.4_1/src/qtbrowserpluginax.def
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserpluginax.def
rename to x2gobrowserplugin-2.4_1/src/qtbrowserpluginax.def
diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtnpapi.h b/x2gobrowserplugin-2.4_1/src/qtnpapi.h
similarity index 100%
rename from qtbrowserplugin-2.4_1-opensource/src/qtnpapi.h
rename to x2gobrowserplugin-2.4_1/src/qtnpapi.h
diff --git a/x2goclient.pro b/x2goclient.pro
index dbb934c..25fc895 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -199,15 +199,15 @@ QMAKE_INFO_PLIST = Info.plist
 plugin {
 	DEFINES += CFGPLUGIN
 	linux-g++ {
-		include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
+		include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri)
 	}
 	linux-g++-64 {
-		include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
+		include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri)
 	}
 	win32-* {
 		DEFINES += QT_NODLL
 		CONFIG += qaxserver
-		include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
+		include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri)
 	}
 	RC_FILE = x2goplugin.rc
 }

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list