Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

Fixed MINGW build errors.

Browse Source
This commit is contained in:
S. Razi Alavizadeh 2012-08-11 02:59:08 +04:30 committed by nowrep
parent 470729ce84
commit c5f1acc03e
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/defines.pri
View File

@ -10,7 +10,7 @@ unix: VERSION = 1.3.1
#DEFINES *= USE_WEBGL #DEFINES *= USE_WEBGL
#DEFINES *= KDE #DEFINES *= KDE
#DEFINES *= PORTABLE_BUILD #DEFINES *= PORTABLE_BUILD
win32 { win32-msvc* {
DEFINES *= W7API DEFINES *= W7API
LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
} }
@ -32,7 +32,9 @@ d_disable_dbus = $$(DISABLE_DBUS)
equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH } equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL } equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL }
equals(d_w7api, "true") { DEFINES *= W7API } win32-msvc* {
equals(d_w7api, "true") { DEFINES *= W7API }
}
equals(d_kde, "true") { DEFINES *= KDE } equals(d_kde, "true") { DEFINES *= KDE }
equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD } equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD }
equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS } equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS }

15
src/lib/3rdparty/qtwin.h vendored
View File

@ -38,14 +38,15 @@
* these functions will simply not do anything. * these functions will simply not do anything.
*/ */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
#include <ShlObj.h> #ifdef W7API
#include <shlwapi.h> #include <ShlObj.h>
#include <Propvarutil.h> #include <shlwapi.h>
#include "msvc2008.h" #include <Propvarutil.h>
#include "msvc2008.h"
DEFINE_PROPERTYKEY(PKEY_Title, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 2);
DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 6);
DEFINE_PROPERTYKEY(PKEY_Title, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 2);
DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 6);
#endif
#endif #endif
class WindowNotifier; class WindowNotifier;
class QT_QUPZILLA_EXPORT QtWin : public QObject class QT_QUPZILLA_EXPORT QtWin : public QObject