Skip to content

Commit e96ebc9

Browse files
author
Paweł Salawa
committed
2 parents dd303b4 + 89a9d80 commit e96ebc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+322
-49
lines changed

‎.github/workflows/win32_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: windows-2019
11+
runs-on: windows-2022
1212

1313
steps:
1414
- name: Notify and quit

‎.github/workflows/win64_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131

3232
jobs:
3333
build:
34-
runs-on: windows-2019
34+
runs-on: windows-2022
3535

3636
steps:
3737
- name: debug

‎.gitignore‎

Lines changed: 133 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,135 @@
1-
/output*
2-
*.user
1+
# ---- General OS junk --------------------------------------------------------
32
.DS_Store
3+
Thumbs.db
4+
ehthumbs.db
5+
Icon?
6+
*.swp
7+
*.swo
8+
*.tmp
9+
*.bak
10+
*.orig
11+
12+
# ---- Qt / Qt Creator --------------------------------------------------------
13+
# Qt Creator user/project files
414
*.pro.user
5-
**/Makefile
6-
**/.qmake.stash
7-
**/qrc_*
8-
SQLiteStudio3/SQLiteStudio3.pro.user.4.8-pre1
9-
SQLiteStudio-installer.xml.backup
15+
*.pro.user.*
16+
*.qbs.user
17+
*.qbs.user.*
18+
CMakeLists.txt.user
19+
*.creator
20+
*.creator.user
21+
*.files
22+
*.includes
23+
*.config
24+
25+
# Qt build artifacts (qmake / moc / rcc / uic)
26+
moc_*
27+
ui_*.h
28+
qrc_*.cpp
29+
*.qmlc
30+
*.jsc
31+
*.qrc.dep
32+
33+
# If using QML cache/build dirs
34+
.qmlcache/
35+
.qmake.stash
36+
.qmake.cache
37+
38+
# ---- Build outputs ----------------------------------------------------------
39+
# Common out-of-source build dirs
40+
build/
41+
build-*/
42+
bin/
43+
lib/
44+
obj/
45+
out/
46+
output/
47+
dist/
48+
tmp/
49+
temp/
50+
51+
# Compiled objects / libs
52+
*.o
53+
*.obj
54+
*.lo
55+
*.la
56+
*.a
57+
*.lib
58+
*.dll
59+
*.dylib
60+
*.so
61+
*.so.*
62+
*.exp
63+
*.pdb
64+
*.idb
65+
66+
# Executables / app bundles
67+
*.exe
68+
*.app/
69+
*.apk
70+
*.ipa
71+
*.msi
72+
73+
# Debug / coverage
74+
*.gcno
75+
*.gcda
76+
*.gcov
77+
*.profraw
78+
*.profdata
79+
*.coverage
80+
lcov.info
81+
82+
# ---- Logs -------------------------------------------------------------------
83+
*.log
84+
logs/
85+
*.trace
86+
87+
# ---- IDEs -------------------------------------------------------------------
88+
# VS Code
89+
.vscode/
90+
.history/
91+
.code-workspace
92+
93+
# CLion / JetBrains
94+
.idea/
95+
cmake-build-*/
96+
97+
# Visual Studio (in case of Windows builds)
98+
.vs/
99+
[Bb]uild*/
100+
[Bb]in/
101+
[Dd]ebug*/
102+
[Rr]elease*/
103+
x64/
104+
x86/
105+
ipch/
106+
*_i.c
107+
*_p.c
108+
109+
# ---- Packaging / installers -------------------------------------------------
110+
*.pkg
111+
*.deb
112+
*.rpm
113+
*.tar
114+
*.tar.*
115+
*.zip
116+
*.7z
117+
118+
# ---- Test & temp data -------------------------------------------------------
119+
coverage/
120+
.cache/
121+
pytest_cache/
122+
*.sqlite
123+
*.db
124+
*.db-shm
125+
*.db-wal
126+
127+
# ---- Misc -------------------------------------------------------------------
128+
# If the project generates translation caches or resources
129+
*.qm
130+
translations/*.qm
131+
132+
# Ignore local env/config overrides
133+
.env
134+
.env.*
135+
.local/

‎Plugins/ScriptingPython/ScriptingPython.pro‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ dynamic_python {
2323
DEFINES += PYTHON_DYNAMIC_BINDING
2424
SOURCES += dynamicpythonapi.cpp
2525
HEADERS += dynamicpythonapi.h
26+
linux : {
27+
CONFIG += link_pkgconfig
28+
PKGCONFIG += python3
29+
}
2630
}
2731

2832
!dynamic_python {

‎SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ The view will remain as it is.</source>
10221022
<location filename="../db/queryexecutor.cpp" line="344"/>
10231023
<location filename="../db/queryexecutor.cpp" line="358"/>
10241024
<location filename="../db/queryexecutor.cpp" line="608"/>
1025-
<source>An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1025+
<source>An error occurred while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
10261026
<translation type="unfinished"/>
10271027
</message>
10281028
<message>

‎SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_af_ZA.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,8 +1024,12 @@ The view will remain as it is.</translation>
10241024
<location filename="../db/queryexecutor.cpp" line="344"/>
10251025
<location filename="../db/queryexecutor.cpp" line="358"/>
10261026
<location filename="../db/queryexecutor.cpp" line="608"/>
1027+
<source>An error occurred while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028+
<translation type="unfinished"/>
1029+
</message>
1030+
<message>
10271031
<source>An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028-
<translation type="unfinished">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
1032+
<translation type="obsolete">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
10291033
</message>
10301034
<message>
10311035
<location filename="../db/queryexecutor.cpp" line="527"/>

‎SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ar_SA.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,8 +1024,12 @@ The view will remain as it is.</translation>
10241024
<location filename="../db/queryexecutor.cpp" line="344"/>
10251025
<location filename="../db/queryexecutor.cpp" line="358"/>
10261026
<location filename="../db/queryexecutor.cpp" line="608"/>
1027+
<source>An error occurred while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028+
<translation type="unfinished"/>
1029+
</message>
1030+
<message>
10271031
<source>An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028-
<translation type="unfinished">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
1032+
<translation type="obsolete">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
10291033
</message>
10301034
<message>
10311035
<location filename="../db/queryexecutor.cpp" line="527"/>

‎SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_be_BY.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,8 +1024,12 @@ The view will remain as it is.</translation>
10241024
<location filename="../db/queryexecutor.cpp" line="344"/>
10251025
<location filename="../db/queryexecutor.cpp" line="358"/>
10261026
<location filename="../db/queryexecutor.cpp" line="608"/>
1027+
<source>An error occurred while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028+
<translation type="unfinished"/>
1029+
</message>
1030+
<message>
10271031
<source>An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028-
<translation type="unfinished">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
1032+
<translation type="obsolete">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
10291033
</message>
10301034
<message>
10311035
<location filename="../db/queryexecutor.cpp" line="527"/>

‎SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_ca_ES.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,8 +1024,12 @@ The view will remain as it is.</translation>
10241024
<location filename="../db/queryexecutor.cpp" line="344"/>
10251025
<location filename="../db/queryexecutor.cpp" line="358"/>
10261026
<location filename="../db/queryexecutor.cpp" line="608"/>
1027+
<source>An error occurred while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028+
<translation type="unfinished"/>
1029+
</message>
1030+
<message>
10271031
<source>An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028-
<translation type="unfinished">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
1032+
<translation type="obsolete">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
10291033
</message>
10301034
<message>
10311035
<location filename="../db/queryexecutor.cpp" line="527"/>

‎SQLiteStudio3/coreSQLiteStudio/translations/coreSQLiteStudio_cs_CZ.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,8 +1024,12 @@ The view will remain as it is.</translation>
10241024
<location filename="../db/queryexecutor.cpp" line="344"/>
10251025
<location filename="../db/queryexecutor.cpp" line="358"/>
10261026
<location filename="../db/queryexecutor.cpp" line="608"/>
1027+
<source>An error occurred while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028+
<translation type="unfinished"/>
1029+
</message>
1030+
<message>
10271031
<source>An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</source>
1028-
<translation type="unfinished">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
1032+
<translation type="obsolete">An error occured while executing the count(*) query, thus data paging will be disabled. Error details from the database: %1</translation>
10291033
</message>
10301034
<message>
10311035
<location filename="../db/queryexecutor.cpp" line="527"/>

0 commit comments

Comments
 (0)