Reset submodule main/applications/gtk-qt-engine/admin to latest HEAD

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1045125941)

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required( VERSION 2.8 )
 project( gtk-qt-engine )
 
 set( PACKAGE gtk-qt-engine )
-set( VERSION R14.0.0 )
+set( VERSION R14.0.5 )
 
 
 ##### include essential cmake modules ###########

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit bf5a8ec42e72c69b546b1e18c1f18e38cf0e6222

cmake

@@ -1 +1 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463
+Subproject commit 2e6daa80e2d7bda8382b7d330549e1b3447ac536

kcm_gtk/kcmgtk.cpp

@@ -188,7 +188,7 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
 	widget->styleIcon->setPixmap(iconLoader.loadIcon("style", TDEIcon::Desktop));
 	widget->styleIcon3->setPixmap(iconLoader.loadIcon("style", TDEIcon::Desktop));
 	widget->fontIcon->setPixmap(iconLoader.loadIcon("fonts", TDEIcon::Desktop));
-	widget->keyboardIcon->setPixmap(iconLoader.loadIcon("keyboard", TDEIcon::Desktop));
+	widget->keyboardIcon->setPixmap(iconLoader.loadIcon("input-keyboard", TDEIcon::Desktop));
 	
 	getInstalledThemes();
 	load();
@@ -267,17 +267,17 @@ void KcmGtk::getInstalledThemes()
 		}
 	}
 	
-	bool gtk3installed = false;
+	bool gtk3installed = !gtk3Themes.empty();
 	widget->styleBox3->clear();
-	if(!gtk3Themes.empty()) {
+	if(gtk3installed) {
 		TQStringList otherGtk3Styles = gtk3Themes.keys();
 		if(otherGtk3Styles.find("tdegtk")!=otherGtk3Styles.end()) {
 			otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
 		}
-		gtk3installed = !otherGtk3Styles.empty();
+		if(otherGtk3Styles.find("Default")==otherGtk3Styles.end()) {
-		if(gtk3installed) {
+			otherGtk3Styles.prepend("Default");
-			widget->styleBox3->insertStringList(otherGtk3Styles);
 		}
+		widget->styleBox3->insertStringList(otherGtk3Styles);
 	}
 	widget->styleKde3->setEnabled(gtk3installed);
 	widget->styleBox3->setEnabled(gtk3installed);

src/qt_qt_wrapper.cpp

@@ -571,8 +571,9 @@ TQString kdeFindDir(const TQString& suffix, const TQString& file1, const TQStrin
 TQString runCommand(const TQString& command)
 {
 	FILE* p = popen(command.latin1(), "r");
-	if ((p == NULL) || (p < 0))
+	if (p == NULL) {
 		return TQString();
+	}
 
 	TQString ret;
 	while (!feof(p))