-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/feature-qt6'
- Loading branch information
Showing
45 changed files
with
736 additions
and
294 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| [submodule "libs/SortFilterProxyModel"] | ||
| path = libs/SortFilterProxyModel | ||
| url = https://github.com/oKcerG/SortFilterProxyModel.git | ||
| url = https://github.com/CasparKielwein/SortFilterProxyModel.git | ||
| branch = feature/full_integration_to_qt6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,30 @@ | ||
| <?xml version="1.0"?> | ||
| <manifest package="org.suwayomi.tachideskqtui" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto"> | ||
| <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. | ||
| Remove the comment if you do not require these default permissions. --> | ||
| <!-- %%INSERT_PERMISSIONS --> | ||
|
|
||
| <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application. | ||
| Remove the comment if you do not require these default features. --> | ||
| <!-- %%INSERT_FEATURES --> | ||
|
|
||
| <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> | ||
|
|
||
| <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Tachidesk Qtui" android:extractNativeLibs="true" android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> | ||
| <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop" android:theme="@style/AppTheme"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN"/> | ||
| <category android:name="android.intent.category.LAUNCHER"/> | ||
| </intent-filter> | ||
|
|
||
| <!-- Application arguments --> | ||
| <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ --> | ||
| <!-- Application arguments --> | ||
|
|
||
| <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> | ||
| <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> | ||
| <meta-data android:name="android.app.repository" android:value="default"/> | ||
| <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/> | ||
| <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/> | ||
| <!-- Deploy Qt libs as part of package --> | ||
| <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/> | ||
|
|
||
| <!-- Run with local libs --> | ||
| <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/> | ||
| <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/> | ||
| <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/> | ||
| <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/> | ||
| <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/> | ||
| <!-- Used to specify custom system library path to run with local system libs --> | ||
| <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> --> | ||
| <!-- Messages maps --> | ||
| <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/> | ||
| <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/> | ||
| <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/> | ||
| <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/> | ||
| <!-- Messages maps --> | ||
|
|
||
| <!-- Splash screen --> | ||
| <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation, | ||
| then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and | ||
| use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you | ||
| are done populating your window with content. --> | ||
| <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / --> | ||
| <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / --> | ||
| <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ --> | ||
| <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ --> | ||
| <!-- Splash screen --> | ||
|
|
||
| <!-- Background running --> | ||
| <!-- Warning: changing this value to true may cause unexpected crashes if the | ||
| application still try to draw after | ||
| "applicationStateChanged(Qt::ApplicationSuspended)" | ||
| signal is sent! --> | ||
| <meta-data android:name="android.app.background_running" android:value="false"/> | ||
| <!-- Background running --> | ||
|
|
||
| <!-- auto screen scale factor --> | ||
| <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/> | ||
| <!-- auto screen scale factor --> | ||
|
|
||
| <!-- extract android style --> | ||
| <!-- available android:values : | ||
| * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons | ||
| * full - useful QWidget & Quick Controls 1 apps | ||
| * minimal - useful for Quick Controls 2 apps, it is much faster than "full" | ||
| * none - useful for apps that don't use any of the above Qt modules | ||
| --> | ||
| <meta-data android:name="android.app.extract_android_style" android:value="minimal"/> | ||
| <!-- extract android style --> | ||
| </activity> | ||
|
|
||
| <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices --> | ||
|
|
||
| </application> | ||
|
|
||
| </manifest> | ||
| <?xml version="1.0"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.suwayomi.qtui" android:installLocation="auto" android:versionCode="1" android:versionName="1.0"> | ||
|
|
||
| <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="16"/> | ||
|
|
||
| <uses-permission android:name="android.permission.INTERNET"/> | ||
| <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | ||
| <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | ||
|
|
||
| <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/> | ||
|
|
||
| <application android:name="org.qtproject.qt.android.bindings.QtApplication" android:allowNativeHeapPointerTagging="false" android:debuggable="true" android:extractNativeLibs="true" android:hardwareAccelerated="true" android:label="Tachidesk Qtui" | ||
| android:requestLegacyExternalStorage="true" | ||
| android:icon="@drawable/icon" | ||
| android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> | ||
| <activity android:name="org.qtproject.qt.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:label="Tachidesk-qtui" android:launchMode="singleTop" android:screenOrientation="unspecified" android:theme="@style/AppTheme"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN"/> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER"/> | ||
| </intent-filter> | ||
| <meta-data android:name="android.app.lib_name" android:value="qtui"/> | ||
| <meta-data android:name="android.app.arguments" android:value=""/> | ||
| <meta-data android:name="android.app.extract_android_style" android:value="default"/> | ||
| </activity> | ||
| </application> | ||
|
|
||
| <!-- %%INSERT_PERMISSIONS --> | ||
| <!-- %%INSERT_FEATURES --> | ||
| </manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ if(MSVC) | |
| /external:anglebrackets | ||
| /external:templates- | ||
| /external:W0 | ||
| /Zc:__cplusplus | ||
| ) | ||
| endif() | ||
| else() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>CFBundleDevelopmentRegion</key> | ||
| <string>English</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>com.suwayomi.tachidesk-qtui</string> | ||
| <key>CFBundleInfoDictionaryVersion</key> | ||
| <string>6.0</string> | ||
| <key>CFBundlePackageType</key> | ||
| <string>dSYM</string> | ||
| <key>CFBundleSignature</key> | ||
| <string>????</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>1.0</string> | ||
| <key>CFBundleVersion</key> | ||
| <string>1</string> | ||
| <key>UILaunchStoryboardName</key> | ||
| <string>LaunchScreen</string> | ||
| <key>UILaunchImageFile</key> | ||
| <string>LaunchImage</string> | ||
| <key>CFBundleExecutable</key> | ||
| <string>$(EXECUTABLE_NAME)</string> | ||
| </dict> | ||
| </plist> |
Submodule SortFilterProxyModel
updated
22 files
| +1 −0 | .gitignore | |
| +9 −5 | CMakeLists.txt | |
| +3 −1 | SortFilterProxyModel.pri | |
| +1 −1 | filters/expressionfilter.cpp | |
| +10 −6 | filters/filtercontainer.cpp | |
| +2 −2 | filters/filtercontainer.h | |
| +5 −2 | filters/rangefilter.cpp | |
| +32 −65 | filters/regexpfilter.cpp | |
| +18 −30 | filters/regexpfilter.h | |
| +1 −1 | proxyroles/proxyrole.h | |
| +6 −6 | proxyroles/proxyrolecontainer.cpp | |
| +2 −2 | proxyroles/proxyrolecontainer.h | |
| +1 −1 | proxyroles/switchrole.h | |
| +347 −375 | qqmlsortfilterproxymodel.cpp | |
| +114 −116 | qqmlsortfilterproxymodel.h | |
| +79 −0 | qvariantlessthan.cpp | |
| +12 −0 | qvariantlessthan.h | |
| +3 −2 | sorters/rolesorter.cpp | |
| +56 −72 | sorters/sorter.cpp | |
| +38 −30 | sorters/sorter.h | |
| +10 −6 | sorters/sortercontainer.cpp | |
| +4 −4 | sorters/sortercontainer.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.