diff -Naur -x .svn vendor\current/build_os2.cmd trunk/build_os2.cmd --- vendor\current/build_os2.cmd 1970-01-01 01:00:00.000000000 +0100 +++ trunk/build_os2.cmd 2013-06-05 16:22:26.000000000 +0200 @@ -0,0 +1,272 @@ +/* SMTube Build Script */ +/* root done by Herwig Bauernfeind, enhanced by Silvan Scherrer */ + +/* version history */ +/* version 0.1.0 from 23.05.2013 Silvan (first edition) */ +/* version 0.1.1 from 05.06.2013 Silvan renamed readme files (happy birthday Justin) */ + +/* init the version string (don't forget to change) */ +version = "0.1.1" +version_date = "05.06.2013" +'@echo off' + +parse arg command option +parse source . . scriptFile + +/* init the required vars */ +qRC = 0 +mRC = 0 +buildDir = strip(directory(),'T','\') /* Make sure we have no trailing backslash */ +sourceDir = FixDir(filespec('D', scriptFile) || filespec('P', scriptFile)) +os2Dir = sourceDir || '\os2' +srcDir = sourceDir || '\src' +installDir = buildDir || '\install' +installDirT= installDir || '\translations' +qErrorFile = buildDir||'\qmake.err' +qOutFile = buildDir||'\qmake.out' +mErrorFile = buildDir||'\make.err' +mOutFile = buildDir||'\make.out' + +/* get the SMTube version */ +SMTube_version = '0.0.0' +call version +internal_build = translate(SMTube_version, '_', '.') + +title = "SMTube for eCS (OS/2) build script v" || version || " from " || version_date +say title +say +say "Build directory:" buildDir +say "Source directory:" sourceDir +say +say "SMTube version:" SMTube_version +say + +/* translate command to all upercase */ +command = translate(command) + +if command = "" then signal help + +if command = "INSTALL" then do + SMTube_build = option + select + when SMTube_build \== "" then do + zipFile = installDir || '\SMTube-' || internal_build || '-' || SMTube_build || '.zip' + end + otherwise do + signal help + end + end +end + +/* now we translate also the options */ +option = translate(option) + +if sourceDir \== buildDir then do + say "Shadow build in progress ..." + say +end + +select + when command = "MAKE" & option = "CLEAN" then do + say "Executing command: "command option + + say "cleaning the tree" + call make 'distclean' + + say "please execute this script again with 'make' to build SMTube" + + end + when command = "MAKE" then do + say "Executing command: "command option + + say "building svn_revision" + ok = SysMkDir(buildDir||'\src') + address cmd 'sh ' sourceDir||'\get_svn_revision.sh ' sourceDir ' "eCS(OS/2) build"' + + say "creating SMTube makefile" + call qmake + + if qRC = 0 then do + say "building SMTube" + if option = "" then do + call make + end + else do + call make 'debug' + end + end + + end + + when command = "INSTALL" then do + say "Executing command: "command + +/* first delete everything */ + call deleteall + +/* create the installDir,and the translation subdir */ + ok = SysMkDir(installDir) + ok = SysMkDir(installDirT) + +/* copy the exe */ + ok = SysCopyObject(buildDir||'\src\smtube.exe',installDir) + +/* copy the readme */ + rm.0 = 3 + rm.1 = 'smtube_en.txt' + rm.2 = 'smtube_de.txt' + rm.3 = 'smtube_fr.txt' + do i = 1 to rm.0 + cmdtorun = 'sed "s;_VERSION_;' || SMTube_version || ';g" ' || os2Dir || '\' || rm.i || ' | sed "s;_BUILD_;' || SMTube_build || ';g" >' || installDir || '\' || rm.i + address cmd cmdtorun + end + +/* create the qm files from ts files */ + ok = SysFileTree(srcDir||'\translations\*.ts', rm.,'FO') + do i = 1 to rm.0 + fileName = filespec('N',rm.i) + fileName = left(fileName,lastpos('.', fileName)-1) || '.qm' + cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDir || '\translations\' || fileName + address cmd cmdtorun + end + +/* zip all dynamic stuff */ + ok = directory(installDir) + cmdtorun = 'zip -r ' || zipFile || ' * -x *.zip' + address cmd cmdtorun + ok = directory(buildDir) + +/* zip all icons */ + ok = directory(os2Dir) + cmdtorun = 'zip ' || zipFile || ' *.ico' + address cmd cmdtorun + ok = directory(buildDir) + + end + + when command = "UNINSTALL" then do + say "Executing command: "command + + call deleteall + + end + + otherwise do + say 'Unknown parameter "'command'" - aborting...' + exit 1 + end +end + +/* cleanup the mess */ +error: + +if qRC = 0 & mRC = 0 then do + ok = SysFileDelete(mOutFile) + ok = SysFileDelete(mErrorFile) + ok = SysFileDelete(qOutFile) + ok = SysFileDelete(qErrorFile) +end +else do + if mRC <> 0 then do + say "Alarm! Make errors occured! Look at "mOutFile" and "mErrorFile + end + if qRC <> 0 then do + say "Alarm! qMake errors occured! Look at "qOutFile" and "qErrorFile + end +end + +exit 0 + +qmake: + address cmd 'qmake ' sourceDir ' 2>'qErrorFile' 1>'qOutFile + qRC = RC + if qRC <> 0 then do + call beep 880, 20 + say "Alarm! qmake RC="RC + end +return + +make: + makeparm = arg(1) + address cmd 'make 'makeparm' 2>'mErrorFile' 1>'mOutFile + mRC = RC + if mRC <> 0 then do + call beep 880, 20 + say "Alarm! make RC="RC + end +return + + +deleteall: /* delete installDir (including subdirs) except zip files */ + + say "Delete all files except *zip in " installDir + ok = SysFileTree(installDir||'\*', rm.,'FOS') + do i = 1 to rm.0 + if translate(right(rm.i, 3)) \== 'ZIP' then do + ok = SysFileDelete(rm.i) + end + end + + say "Delete zip file " zipFile + ok = SysFileDelete(zipFile) + + say "Removing subdirs from " || installDir + ok = SysFileTree(installDir||'\*', rm.,'OS') + do i = 1 to rm.0 + ok = SysRmDir(rm.i) + end + + call SysSleep(5) +return + +/** + * Fixes the directory path by a) converting all slashes to back + * slashes and b) ensuring that the trailing slash is present if + * the directory is the root directory, and absent otherwise. + * + * @param dir the directory path + * @param noslash + * optional argument. If 1, the path returned will not have a + * trailing slash anyway. Useful for concatenating it with a + * file name. + */ +FixDir: procedure expose (Globals) + parse arg dir, noslash + noslash = (noslash = 1) + dir = translate(dir, '\', '/') + if (right(dir, 1) == '\' &, + (noslash | \(length(dir) == 3 & (substr(dir, 2, 1) == ':')))) then + dir = substr(dir, 1, length(dir) - 1) + return dir + +/** + * reads the version.cpp and gets the SMTube version from there + */ +version: procedure expose SMTube_version srcDir + + SMTubeVer = ' ' + /* SMTube Version file */ + Version = srcDir || "\version.cpp" + + do until lines(Version) = 0 + verline = linein(Version) + if left(Verline,15) = "#define VERSION" then do + parse var verline . ' '. ' ' SMTubeVer + end + end + + ok = stream(Version,'c','close') + if SMTubeVer \== ' ' then do + SMTube_version = strip(SMTubeVer,,'"') + end + + return + +help: + say "Parameters:" + say " make" + say " make debug" + say " make clean" + say " install version" + say " uninstall" +exit 255 diff -Naur -x .svn vendor\current/get_svn_revision.sh trunk/get_svn_revision.sh --- vendor\current/get_svn_revision.sh 2012-02-24 23:23:26.000000000 +0100 +++ trunk/get_svn_revision.sh 2013-05-23 18:29:44.000000000 +0200 @@ -7,10 +7,14 @@ test "$1" && extra="-$1" svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` +test $svn_revision || svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2` test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null` test $svn_revision || svn_revision=0UNKNOWN +if test "$2"; then +extra="-$2" +fi NEW_REVISION="#define SVN_REVISION \"SVN-r${svn_revision}${extra}\"" OLD_REVISION=`cat src/svn_revision.h 2> /dev/null` diff -Naur -x .svn vendor\current/os2/smtube_de.txt trunk/os2/smtube_de.txt --- vendor\current/os2/smtube_de.txt 1970-01-01 01:00:00.000000000 +0100 +++ trunk/os2/smtube_de.txt 2013-05-27 16:30:32.000000000 +0200 @@ -0,0 +1,95 @@ +SMTube _VERSION_ _BUILD_ README + +(W) Silvan Scherrer, Mai 27, 2013 +zuletzt gendert am 27.05.2013 + +0. INHALT DIESER DATEI +====================== + +1. ERFORDERNISSE + +2. INSTALLATION + +3. LIZENZ, URHEBERRECHT, HAFTUNGSAUSSCHLUSS + +4. KONTAKT + +5. UNTERSTTZUNG UND SPENDEN + +6. ENTWICKLUNGSGESCHICHTE + + +1. ERFORDERNISSE +================ + +Folgende Voraussetzungen mssen installiert werden. + + +1.1 SMPlayer +------------ + + 1. Download SMPlayer 0.8.5 oder neuer (unter http://svn.netlabs.org/qtapps + befinden sich weitere Informationen) + 2. Installieren gemss Anleitung des SMPlayer + + +2. INSTALLATION +=============== + +Zur Installation von SMTube fhren Sie folgende Schritte aus: + + 1. Entpacken Sie das SMTube-Paket in das selbe Verzeichnis wie SMPlayer. + 2. Mittels F11 im SMPlayer knnen nun YouTube Videos gesucht und abgespielt + werden. + +3. LIZENZ, URHEBERRECHT, HAFTUNGSAUSSCHLUSS +=========================================== + +SMTube ist (c) 2012-2013 RVM . + +Das Urheberrecht der OS/2-Portierung ist (c) 2013 Silvan Scherrer. + +Dieses Programm ist freie Software; Sie knnen es unter den Bedingungen +der GNU General Public License, wie in der Datei COPYING im +Installationsverzeichnis enthalten, weiterverbreiten und/oder +modifizieren. + +Der Original-Quelltext ist erhltlich unter: + + http://smplayer.sourceforge.net + +Dieses Programm wird in der Hoffnung vertrieben, da es ntzlich ist, +aber OHNE JEDWEDE HAFTUNG und ohne implizite Garantie der +MARKFHIGKEIT oder der BENUTZBARKEIT FR EINEN BESTIMMTEN ZWECK. + +Einzelheiten entnehmen Sie bitte der Datei COPYING. + + +4. KONTAKT +========== + +Wenn Sie einen Fehler entdecken, dann erstellen Sie bitte ein Ticket unter +http://svn.netlabs.org/qtapps + +Es werden nur Meldungen reproduzierbarer Fehler akzeptiert. :-) + + +5. UNTERSTTZUNG UND SPENDEN +============================ + +SMTube basiert auf freiwilliger, ehrenamtlicher Arbeit. Wenn Sie die weitere +Entwicklung untersttzen mchten, haben Sie folgende Mglichkeiten: + + * Spenden ans QT4 Projekt: meht Informationen unter http://qt.netlabs.org + + * Mitarbeit am Projekt: Neben der eigentlichen Entwicklung gehrt hierzu + auch die Pflege der Dokumentation und der Projekt-Web-Site sowie Hilfe fr + Anwender. + + +6. ENTWICKLUNGSGESCHICHTE +========================= + +2013-05-23 + * erste Version + diff -Naur -x .svn vendor\current/os2/smtube_en.txt trunk/os2/smtube_en.txt --- vendor\current/os2/smtube_en.txt 1970-01-01 01:00:00.000000000 +0100 +++ trunk/os2/smtube_en.txt 2013-05-27 16:30:54.000000000 +0200 @@ -0,0 +1,94 @@ +SMTube _VERSION_ _BUILD_ README + +(W) Silvan Scherrer, May 27, 2013 +last update May 27, 2013 + + +0. CONTENTS OF THIS FILE +======================== + +1. REQUIREMENTS + +2. INSTALLATION + +3. LICENSE, COPYRIGHT, DISCLAIMER + +4. CONTACT + +5. SUPPORT AND DONATIONS + +6. HISTORY + + +1. REQUIREMENTS +=============== + +The following requirements need to be installed. + + +1.1 SMPlayer +------------ + + 1. Download SMPlayer 0.8.5 or better (see http://svn.netlabs.org/qtapps for + more information) + 2. Install the files according to the readme + + +2. INSTALLATION +=============== + +To install SMTube, do the following: + + 1. Extract the SMTube package into the same directory as SMPlayer is. + 2. With F11 in SMPlayer you can play and search for YouTube videos + + +3. LICENSE, COPYRIGHT, DISCLAIMER +================================= + +SMTube is copyright (C) 2012-2012 RVM . + +The OS/2 port is copyright (c) 2013 Silvan Scherrer. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as contained in +the file COPYING in the installation directory. + +The original source code is available at: + + http://smplayer.sourceforge.net + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +For details, refer to the file COPYING. + + +4. CONTACT +========== + +If you find a bug, then add a ticket to the trac at +http://svn.netlabs.org/qtapps + +Only bug reports with a reproducable bug are accepted. :-) + + +5. SUPPORT AND DONATIONS +======================== + +SMTube is based on volunteer work. If you would like to support further +development, you can do so in one of the following ways: + + * Donate to the Qt4 project: see http://qt.netlabs.org for more information + + * Contribute to the project: Besides actual development, this also includes + maintaining the documentation and the project web site as well as help + for users. + + +6. HISTORY +========== + +2013-05-23 + * first version diff -Naur -x .svn vendor\current/os2/smtube_fr.txt trunk/os2/smtube_fr.txt --- vendor\current/os2/smtube_fr.txt 1970-01-01 01:00:00.000000000 +0100 +++ trunk/os2/smtube_fr.txt 2013-05-28 12:53:00.000000000 +0200 @@ -0,0 +1,101 @@ +SMTube _VERSION_ _BUILD_ LISEZMOI + +Document original....: (W) Silvan Scherrer, May 27, 2013 +Dernire mise jour.: 2013-05-27 +Traduction franaise.: Guillaume Gay +Version..............: 2013-05-27 + + +0. CONTENU DU FICHIER +===================== + +1. PRREQUIS + +2. INSTALLATION + +3. LICENCE, COPYRIGHT, MENTIONS LGALES + +4. CONTACT + +5. SOUTIEN ET DONS + +6. HISTORIQUE DES VERSIONS + + +1. PRREQUIS +============ + +Le produit suivant ncessite d'tre install au pralable. + +1.1 SMPlayer +------------ + + 1. Tlcharger SMPlayer version 0.8.5 ou ultrieure + (voir http://svn.netlabs.org/qtapps pour plus d'information) + 2. Installer les fichiers selon les instructions figurant dans + le fichier lisezmoi + + +2. INSTALLATION +=============== + +Pour installer SMTube : + + 1. Extrayez le contenu du paquetage dans le mme rpertoire + que celui de SMPlayer. + 2. En appuyant sur la touche F11 dans SMPlayer, vous pouvez + rechercher et lire les vidos YouTube. + + +3. LICENCE, COPYRIGHT, MENTIONS LGALES +======================================= + +SMTube est un copyright (C) 2006-2013 de RVM . + +Le portage pour OS/2 est un copyright (C) 2013 de Silvan Scherrer. + +Ce programme est un gratuiciel ; vous pouvez le redistribuer et/ou +le modifier selon les termes de la licence Publique Gnrale GNU +contenue dans le fichier COPYING situ dans rpertoire d'installation. + +Le code source original est disponible sur : + + http://smplayer.sourceforge.net + +Ce programme est distribu dans l'espoir qu'il sera utile quelque +chose, mais SANS AUCUNE GARANTIE ; sans mme la garantie implicite de +COMMERCIALISATION ou d'ADQUATION UN BUT PARTICULIER. + +Pour plus de dtails, veuillez vous rfrer au fichier COPYING. + + +4. CONTACT +========== + +Si vous rencontrez un problme, ouvrez un ticket dans le systme +trac sur http://svn.netlabs.org/qtapps. + +Seuls les rapports de bogues reproductibles seront accepts, bien +entendu ! :-) + + +5. SOUTIEN ET DONS +================== + +SMTube est bas sur le volontariat. Si vous voulez soutenir les +dveloppements futurs, vous pouvez le faire de l'une des manires +suivantes : + + * Faites un don pour le projet Qt4 : consultez http://qt.netlabs.org + pour plus d'informations. + + * Contribuez au projet : outre le dveloppement pur, il y a aussi la + maintenance de la documentation, la maintenance du site web du + projet, ainsi que l'aide aux utilisateurs. + + +6. HISTORIQUE DES VERSIONS +========================== + +2013-05-23 + * Version initiale diff -Naur -x .svn vendor\current/os2/smtube.ico trunk/os2/smtube.ico --- vendor\current/os2/smtube.ico 1970-01-01 01:00:00.000000000 +0100 +++ trunk/os2/smtube.ico 2013-05-23 19:53:18.000000000 +0200 @@ -0,0 +1,62 @@ +CI : @CI : @@|???? ??? 2X } o H) 2.V[Z`bl]:`4 H+BWtyvvwz|yxtb o+zsdhZcw\yqpiVGC9*' ++p9Z^oXP~-"2 X{yxwwuwz}  !Qˊس޸ˬ߷kqtyyvyyvHB >wywvy|$;HQQGf̘ԬٶݼʈN!|yxwwxzvH2Kkxxwu Snv{ŠƏȌ֤ۮͅIBQR>#} +yzvn46vwwy(YgkvƂ́σЂӅۖ؄l۞ݻس͢z< vtg!Syxz"KZdjaTV]]^bl׎ތ^܂ڴuutW2< dwx;RXK:7AB=@GOjۗaHفٶnvsrY"v|{,IE4./775KPgbxޘӁՄ׈ًېߙܓݕܕޙߝ߹խ1U M;1'~yy%!,367;̀`كҀҀҀӀӀՅُ׋|y҃Չژ۬˛RJ-C" )w"0A(rn q w $*'$+9Z^ڇtw}~|w{҂{kemx҇әhisQ tYqy$|'hmjo +}#"Fыdߎcehlqutzml`Ubd…‚𽈒i> +NA^ dme ale`o*n'iko"}5ƨƹƽƾżŦaŧbžŷęVĕOĖQėRĘRĘSĘUĜ]ÚZÖQÖRÏG˞Z~ЃT˅ˆtjC$(SW\ +Za ^k` B.!)(&*'%)'%)&$)&$('&(('''&&&&&&%&%$%$!%%$$$$#####"#""""""!!   =7-ytSdƂ|zߖa2 + ANRQQ` ^li:*  !!!!  51*ŋvT[[xnlj7 6,FILINXe of:) !! 42,ΠՆg]FYja܎UH)>AEDGKSfoa 9& ! 42,լܒ҇tC:[UTW*6#>??@FN`iu g 9'  32.͈R?CPKx:G7@<DX[~3CC x8) 222ן\BDJFEF".FBIer"{'x| 7. 222҅g5@EEFk.$,UTKUj +y 2Xz,Sh6+777iiiWWW444!!! 221b*0G>~3w$#5jhf[bp5RhnbJU6%###eee䯯ooo>>>### + + +1-&լ٥Tzsy 60 \C>CqtpiT\ s,LWnLO +K6$%%%pppIII''' +0*͞اˑ=rqq{ wUc&@uwvoRE]}9I]tͣnV5"%%%pppҔVVV--- /,(άްӟć9zuoqzzySO :qyypVEIe=JbzҬڷ㸘4-($$$ooo১eee555 + + + /,(ͫڬѝŊOtmf +l,yxxuPrxyw_@@O m)}:Mg~Ę԰320###ooo빹ttt444 + + + .,)ή٬ўÉi}(\[lu ruxwwxyzqH/:[o,z9Qjǝ׶320###ooosss + + + -+(ѴݴҢˆtXd hjdgnvxvz{{f4)4_n+{:Smɡۼ220"""ooo}}}777 + + + -+'Ѵ޶թŏt{)b [Z\ ctyz|{|X&(5]s2}>Tn˥110"""nnn寯lll888 + + + ,+(־خȗmqv&PRQSYpxz{|}P#$7Zk*IWp̧110!!!nnnٜ[[[--- + + + ,)&ԼѦO;KbIGJLPlyyzO%&9Vc!CdyЮ00. mmmɈKKK%%% + + + +(%ӻܸZYy`bDCEGLiz{w^/(:Sg'Ggϭа0,#bbb鶶ttt>>> + + + *(%ϵ}iFV@BCMj}zFsC,;Yl-{>Y{ӳx/(444nnnZZZ222 + + + *$vϤy^Ao%B@DUt|^rq]9< U^t6\}ϯȓX/) + + + + + + *橀ײʟt`@kKCIe{v. 0}wTAL\s6VYQ}Bo/bs.,* + + + +'$ζֱƚo`DbW EVevC& 7zuiQIZs6|AR Y^g Mɡ-,+ + + + ,)&˱ѫ”i[Aj_>EV_@ 9l[SGW r4\i&d!e$w$jк/-+ ,(%ƫͥzcV:eY +7;2I+I F;Sr1e[q2l-/՘1/,555}}}ggg fffsss'''VVVαǞs]Qx1`Q47^'=0Gq.bUw4'~rhbMMM񧧧555(((MMM '''ҵ˜kVKp$a D7-V% :9V l#H~~6MϯֿͧGGG vvvyyyJJJ쑑*** >>>ͮzcODo"]4:/3HH]] Q7EЉ,,,@@@LLL ###ccc$$$rmir]MBjD36 GK?Vml]čԥ666 fff + + + WWW肂TNJr`Ov&V4:&O 7NN{,mʨ{ֳѼǸfff MMM000)))HHH %%%ƧfK;hF35 EXFr39ks򼟇~)++'''TTTgghppp + VWW|W7MD>LEAnmlhhhGFDIDAIB=VKDxwuMJHOHDQD;WKCmQ.m@<4*__'c) `˲̱ѸҼԿݭ̔ϲʭɫ׾ѵwXD}"R8A<B+re$O˴Ѻտ۱ب׿Ժֽ̯c4+h:I$ah_#%;ݰսŤx; +xCQ4 R 5GѷIS[J +YAYsϲb^h\2:.>lf6`td2֨wЯ[!x }!4vtֲȄSq m7?1\ƿºƾԜkoBz.~ +iFh3Êɹɺʵض|ӾUTS'^IשIfҎѫͺ˕CM|io\$}#qY߳7q¼¼żú÷ŝvE2/ Û D7I<C6'A1!pUNvԢ鷯ĽǿȾǽĸv@ܬ;.9*#G42`IFuVUzZWy]Xz[WzZVsU:K7 E3 +cLsˣˡl1&  \ No newline at end of file diff -Naur -x .svn vendor\current/smtube.pro trunk/smtube.pro --- vendor\current/smtube.pro 1970-01-01 01:00:00.000000000 +0100 +++ trunk/smtube.pro 2013-05-23 18:30:40.000000000 +0200 @@ -0,0 +1,5 @@ +TEMPLATE = subdirs + +SUBDIRS += src + +src.file=src/smtube.pro \ No newline at end of file diff -Naur -x .svn vendor\current/src/main.cpp trunk/src/main.cpp --- vendor\current/src/main.cpp 2013-01-12 01:03:30.000000000 +0100 +++ trunk/src/main.cpp 2013-05-23 19:40:56.000000000 +0200 @@ -43,7 +43,7 @@ } QString translationsPath() { - QString path = "translations"; + QString path = QString(qApp->applicationDirPath() + "/translations"); #if !defined(Q_OS_WIN) #ifdef TRANSLATION_PATH QString s = QString(TRANSLATION_PATH); diff -Naur -x .svn vendor\current/src/players.cpp trunk/src/players.cpp --- vendor\current/src/players.cpp 2013-01-12 01:03:30.000000000 +0100 +++ trunk/src/players.cpp 2013-05-23 18:40:32.000000000 +0200 @@ -25,11 +25,11 @@ if (found) *found = true; QString bin = qApp->applicationDirPath() + "/" + player_bin; - #ifdef Q_OS_WIN + #if defined(Q_OS_WIN) || defined(Q_OS_OS2) bin += ".exe"; #endif -#ifndef Q_OS_WIN +#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2) QFileInfo fi(bin); if (!fi.exists() || !fi.isExecutable() || fi.isDir()) { qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData()); diff -Naur -x .svn vendor\current/src/qtsingleapplication/qtlocalpeer.cpp trunk/src/qtsingleapplication/qtlocalpeer.cpp --- vendor\current/src/qtsingleapplication/qtlocalpeer.cpp 2012-03-05 14:25:32.000000000 +0100 +++ trunk/src/qtsingleapplication/qtlocalpeer.cpp 2013-05-23 18:23:28.000000000 +0200 @@ -48,7 +48,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); static PProcessIdToSessionId pProcessIdToSessionId = 0; #endif -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) || defined(Q_OS_OS2) #include #include #endif diff -Naur -x .svn vendor\current/src/smtube_os2.rc trunk/src/smtube_os2.rc --- vendor\current/src/smtube_os2.rc 1970-01-01 01:00:00.000000000 +0100 +++ trunk/src/smtube_os2.rc 2013-05-23 19:46:54.000000000 +0200 @@ -0,0 +1 @@ +ICON 1 DISCARDABLE "..\os2\smtube.ico" diff -Naur -x .svn vendor\current/src/smtube.pro trunk/src/smtube.pro --- vendor\current/src/smtube.pro 2013-05-03 23:03:38.000000000 +0200 +++ trunk/src/smtube.pro 2013-05-23 19:47:44.000000000 +0200 @@ -91,3 +91,7 @@ win32 { RC_FILE = smtube.rc } + +os2 { + RC_FILE = smtube_os2.rc +}