diff options
| author |  Fabio Bas | 2012-09-25 13:15:57 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-09-25 13:15:57 +0000 |
| commit | 4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c (patch) | |
| tree | 2a36735ae8685b0d6011f1bfdf0d27ec6211089b /src/modules/addon | |
| parent | Properly sort the console windows when sorting by name is selected in the tre... (diff) | |
| download | KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.gz KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.bz2 KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.zip | |
qt5 support (sip): code only, no touch to build system by now
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6251 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/addon')
| -rw-r--r-- | src/modules/addon/AddonFunctions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/addon/WebAddonInterfaceDialog.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index f3ccb72db..e0a762ac8 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -221,7 +221,7 @@ namespace AddonFunctions // Now we have all stuff in ~/.config/KVIrc/tmp/$rand KviQString::escapeKvs(&szUnpackPath, KviQString::EscapeSpace); - if(!KviKvsScript::run(QString::fromAscii("parse %1/install.kvs").arg(szUnpackPath), g_pActiveWindow)) + if(!KviKvsScript::run(QString::fromLatin1("parse %1/install.kvs").arg(szUnpackPath), g_pActiveWindow)) { // Parsing the script failed // However, the user should already be notified via normal script output. diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp index c0e69cf69..b16b1b0b8 100644 --- a/src/modules/addon/WebAddonInterfaceDialog.cpp +++ b/src/modules/addon/WebAddonInterfaceDialog.cpp @@ -69,9 +69,7 @@ bool WebAddonInterfaceDialog::packageIsInstalled(const QString &szId,const QStri return KviMiscUtils::compareVersions(pAddon->version(),szVersion) < 0; } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "WebAddonInterfaceDialog.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + #endif //COMPILE_WEBKIT_SUPPORT |