Compare commits

...

73 Commits

Author SHA1 Message Date
TDE Gitea bb5a4837ff Reset submodule main/libraries/python-trinity/admin to latest HEAD 5 months ago
Slávek Banko edab482632
Remove cmake submodule since it has now been replaced by cmake-trinity dependency. 1 year ago
TDE Gitea ac1aa6687d Reset submodule main/libraries/python-trinity/cmake to latest HEAD 1 year ago
TDE Gitea f923b36f21 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 1 year ago
TDE Gitea 76fb830e0f Reset submodule main/libraries/python-trinity/cmake to latest HEAD 1 year ago
TDE Gitea 8ad5a2c833 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 1 year ago
TDE Gitea 9f7462a5d4 Reset submodule main/libraries/python-trinity/admin to latest HEAD 1 year ago
TDE Gitea 02a76679fa Reset submodule main/libraries/python-trinity/cmake to latest HEAD 1 year ago
TDE Gitea 4092f22411 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea fd9af7f847 Reset submodule main/libraries/python-trinity/admin to latest HEAD 2 years ago
TDE Gitea 17458a1f17 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 2e1d58c0a3 Reset submodule main/libraries/python-trinity/admin to latest HEAD 2 years ago
TDE Gitea dd06ea1abf Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 4551dcbb36 Reset submodule main/libraries/python-trinity/admin to latest HEAD 2 years ago
TDE Gitea d4854d26c3 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 81cfe30d5e Reset submodule main/libraries/python-trinity/admin to latest HEAD 2 years ago
TDE Gitea d44f3e7a80 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 1df8d41bba Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 2ba82974db Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 03003c1fa0 Reset submodule main/libraries/python-trinity/admin to latest HEAD 2 years ago
TDE Gitea 680bfba351 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 77370539b3 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea a68de028ba Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 2a00bd94f1 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 873dc4226b Reset submodule main/libraries/python-trinity/admin to latest HEAD 2 years ago
TDE Gitea a82ec2745a Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 1a1797f09e Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea d72e3837db Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea c4df214695 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 177b61c8fa Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea f8d7eec545 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 65e6d2d58b Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 9e2b74abb6 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 2 years ago
TDE Gitea 4f9be9a72d Reset submodule main/libraries/python-trinity/cmake to latest HEAD 3 years ago
Slávek Banko c094d3ab73
Switch all submodules to https. 3 years ago
TDE Gitea 340d1d95c0 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 3 years ago
TDE Gitea 2f04c0a75d Reset submodule main/libraries/python-trinity/cmake to latest HEAD 3 years ago
TDE Gitea 697dd420c5 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 3 years ago
TDE Gitea 751b65e9fc Reset submodule main/libraries/python-trinity/cmake to latest HEAD 3 years ago
TDE Gitea 23872e222b Reset submodule main/libraries/python-trinity/admin to latest HEAD 3 years ago
TDE Gitea 0442962fcc Reset submodule main/libraries/python-trinity/cmake to latest HEAD 3 years ago
TDE Gitea dbe78c3590 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 3 years ago
TDE Gitea 00a9ab9651 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 4 years ago
TDE Gitea 029e6b53ba Reset submodule main/libraries/python-trinity/cmake to latest HEAD 4 years ago
TDE Gitea a2ea962d72 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 4 years ago
TDE Gitea 379a095041 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 4 years ago
TDE Gitea f5d19d8e38 Reset submodule main/libraries/python-trinity/admin to latest HEAD 4 years ago
TDE Gitea 3e01a83e43 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 4 years ago
TDE Gitea 81cdb99dd9 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 4 years ago
TDE Gitea be2a3c0917 Reset submodule main/libraries/python-trinity/admin to latest HEAD 4 years ago
Slávek Banko 6baece3f8c Reset submodule main/libraries/python-trinity/admin to latest HEAD 4 years ago
Slávek Banko 050bfbf47a Reset submodule main/libraries/python-trinity/admin to latest HEAD 4 years ago
Slávek Banko 4541b79a6a Reset submodule main/libraries/python-trinity/admin to latest HEAD 4 years ago
Slávek Banko fbb4a53660 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 5 years ago
Slávek Banko f01fa69665 Reset submodule main/libraries/python-trinity/admin to latest HEAD 6 years ago
Slávek Banko ab3a8efcf1 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 7 years ago
Slávek Banko fe54d473f6 Reset submodule main/libraries/python-trinity/admin to latest HEAD 7 years ago
Slávek Banko a6f67afe63 Reset submodule main/libraries/python-trinity/admin to latest HEAD 9 years ago
Slávek Banko acf9686dc7 Reset submodule main/libraries/python-trinity/admin to latest HEAD 9 years ago
Slávek Banko 3f2a3fe6f0 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 9 years ago
Francois Andriot a3f1c478a5 Fix "ANY" macro deprecation 10 years ago
Slávek Banko 6d40afe5ae Reset submodule main/libraries/python-trinity/cmake to latest HEAD 10 years ago
Slávek Banko 364444538f Reset submodule main/libraries/python-trinity/cmake to latest HEAD 10 years ago
Slávek Banko f5dbbd3844 Reset submodule main/libraries/python-trinity/cmake to latest HEAD 10 years ago
Slávek Banko dbf3f86642 Reset submodule main/libraries/python-trinity/admin to latest HEAD 10 years ago
Slávek Banko a91835c1c8 Fix mandrake distribution detection 10 years ago
Slávek Banko 11be3bf278 Fix 'pytdeconfig.py' installation directory 10 years ago
Slávek Banko fbae8dceda Reset submodule main/libraries/python-trinity/cmake to latest HEAD 10 years ago
Slávek Banko 624770b4ae Reset submodule main/libraries/python-trinity/cmake to latest HEAD 10 years ago
Slávek Banko 0366c76a5d Reset submodule main/libraries/python-trinity/admin to latest HEAD 10 years ago
Slávek Banko 62b3cd8348 Update final HTML install path so all modules are consistent. 10 years ago
Darrell Anderson e80100ffcf GCC 4.7 fixes. 10 years ago
Slávek Banko 5c8cf184ce Add common directories 10 years ago
  1. 3
      .gitmodules
  2. 1
      admin
  3. 4
      configure.py
  4. 2
      sip/kdecore/kaccel.sip
  5. 2
      sip/kdecore/kaccelbase.sip
  6. 2
      sip/kdecore/kglobalaccel.sip
  7. 4
      sip/kdeui/keditlistbox.sip
  8. 2
      sip/kdeui/qxembed.sip

3
.gitmodules vendored

@ -0,0 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

1
admin

@ -0,0 +1 @@
Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

4
configure.py

@ -513,7 +513,7 @@ def check_distribution ():
for file in dist:
if file.find ("andrake") > 0:
kde_sip_flags.remove ("ALL")
kde_sip_flags.pop()
kde_sip_flags.append ("D_MANDRAKE")
def set_sip_flags():
@ -786,7 +786,7 @@ def create_makefiles():
sipconfig.ParentMakefile(
configuration = pyqtcfg,
subdirs = subdirs,
installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)]
installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), opt_kdebasedir + "/bin")]
).generate()

2
sip/kdecore/kaccel.sip

@ -35,7 +35,7 @@ public:
KAccel (QWidget* /TransferThis/, const char* = 0);
KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
KAccelActions& actions ();
bool isEnabled () const;
bool isEnabled ();
void setEnabled (bool);
bool setAutoUpdate (bool);

2
sip/kdecore/kaccelbase.sip

@ -48,7 +48,7 @@ public:
KAccelBase (int);
uint actionCount () const;
KAccelActions& actions ();
bool isEnabled () const;
bool isEnabled ();
KAccelAction* actionPtr (const QString&);
KAccelAction* actionPtr (const KKey&);
KAccelAction* actionPtr (const KKeyServer::Key&);

2
sip/kdecore/kglobalaccel.sip

@ -33,7 +33,7 @@ class KGlobalAccel : QObject
public:
KGlobalAccel (QObject*, const char* = 0);
bool isEnabled () const;
bool isEnabled ();
void setEnabled (bool);
KAccelAction* insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);

4
sip/kdeui/keditlistbox.sip

@ -114,7 +114,7 @@ public:
sipCpp->insertStrList (strings, n, a1);
Py_END_ALLOW_THREADS
sipFree((ANY *)strings);
sipFree((void *)strings);
%End
void insertItem (const QString&, int = -1);
@ -194,7 +194,7 @@ const char **PyQtListToArray(PyObject *lst)
if ((s = PyString_AsString(PyList_GetItem(lst,i))) == NULL)
{
sipFree((ANY *)str);
sipFree((void *)str);
return NULL;
}

2
sip/kdeui/qxembed.sip

@ -72,7 +72,7 @@ public:
sipRes = QXEmbed::processClientCmdline (a0, n, strings);
Py_END_ALLOW_THREADS
sipFree((ANY *)strings);
sipFree((void *)strings);
%End

Loading…
Cancel
Save