Reviewed by Csaba Osztrogonác.
[Qt] Clean up the project files and move common options to WebKit.pri.
Mac related changes suggested by Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Source/WebKit.pri: Common options should be here.
Also move Mac options to this file to fix the Mac build.
2011-03-01 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Clean up the project files and move common options to WebKit.pri.
* JavaScriptCore.pri: Move options also needed in WebCore into WebKit.pri.
* JavaScriptCore.pro: Deduplicate options.
* jsc.pro: Ditto.
2011-03-01 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Clean up the project files and move common options to WebKit.pri.
* api/QtScript.pro: Deduplicate options.
2011-03-01 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Clean up the project files and move common options to WebKit.pri.
No new tests needed.
* WebCore.pri: Move common options to WebKit.pri.
* WebCore.pro: Ditto.
2011-03-01 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Clean up the project files and move common options to WebKit.pri.
* QtWebKit.pro: Move common options to WebKit.pri.
2011-03-01 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Clean up the project files and move common options to WebKit.pri.
* WebKit2.pro: Deduplicate options.
2011-03-01 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Clean up the project files and move common options to WebKit.pri.
* WebKitTestRunner/qt/WebKitTestRunner.pro: Deduplicate.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79999
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
2011-03-01 Andras Becsi <abecsi@webkit.org>
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Clean up the project files and move common options to WebKit.pri.
+
+ Mac related changes suggested by Prasanth Ullattil <prasanth.ullattil@nokia.com>
+
+ * Source/WebKit.pri: Common options should be here.
+ Also move Mac options to this file to fix the Mac build.
+
+2011-03-01 Andras Becsi <abecsi@webkit.org>
+
Unreviewed build fix.
[Qt] Fix minimal build.
+2011-03-01 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Clean up the project files and move common options to WebKit.pri.
+
+ * JavaScriptCore.pri: Move options also needed in WebCore into WebKit.pri.
+ * JavaScriptCore.pro: Deduplicate options.
+ * jsc.pro: Ditto.
+
2011-03-01 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = generated
}
-CONFIG(standalone_package): DEFINES *= NDEBUG
-
JAVASCRIPTCORE_INCLUDEPATH = \
$$PWD \
$$PWD/.. \
contains(QT_CONFIG, embedded):CONFIG += embedded
-CONFIG(QTDIR_build) {
- # Make sure we compile both debug and release on mac when inside Qt.
- # This line was extracted from qbase.pri instead of including the whole file
- win32|mac:!macx-xcode:CONFIG += debug_and_release
-} else {
- !CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
- } else { # Release
- OBJECTS_DIR = obj/release
- }
- # Make sure that build_all follows the build_all config in WebCore
- mac:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework):!build_pass:CONFIG += build_all
-}
-
# WebCore adds these config only when in a standalone build.
# qbase.pri takes care of that when in a QTDIR_build
# Here we add the config for both cases since we don't include qbase.pri
CONFIG += no_debug_info
}
-# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
-win32-g++* {
- TMPPATH = $$quote($$(INCLUDE))
- QMAKE_INCDIR_POST += $$split(TMPPATH,";")
- TMPPATH = $$quote($$(LIB))
- QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
-}
-
*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
-!CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
-} else { # Release
- OBJECTS_DIR = obj/release
-}
OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP}
include($$PWD/JavaScriptCore.pri)
prependJavaScriptCoreLib(.)
+2011-03-01 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Clean up the project files and move common options to WebKit.pri.
+
+ * api/QtScript.pro: Deduplicate options.
+
2011-02-24 Andras Becsi <abecsi@webkit.org>
Reviewed by Laszlo Gombos.
CONFIG += building-libs
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../generated
-!CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
-} else { # Release
- OBJECTS_DIR = obj/release
-}
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
include($$PWD/../../../WebKit.pri)
+2011-03-01 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Clean up the project files and move common options to WebKit.pri.
+
+ No new tests needed.
+
+ * WebCore.pri: Move common options to WebKit.pri.
+ * WebCore.pro: Ditto.
+
2011-03-01 Steve Block <steveblock@google.com>
Reviewed by Pavel Feldman.
} else {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
-
- !CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
- } else { # Release
- OBJECTS_DIR = obj/release
- }
}
V8_DIR = "$$[QT_INSTALL_PREFIX]/src/3rdparty/v8"
LIBS += -lgdi32
LIBS += -lole32
LIBS += -luser32
-
- # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
- win32-g++* {
- TMPPATH = $$quote($$(INCLUDE))
- QMAKE_INCDIR_POST += $$split(TMPPATH,";")
- TMPPATH = $$quote($$(LIB))
- QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
- }
}
# Remove whole program optimizations due to miscompilations
CONFIG += depend_includepath
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
-include($$PWD/WebCore.pri)
include($$PWD/../WebKit.pri)
+include($$PWD/WebCore.pri)
include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
TEMPLATE = lib
# Detect that we are building as a standalone package by the presence of
# either the generated files directory or as part of the Qt package through
# QTDIR_build
-CONFIG(QTDIR_build): CONFIG += standalone_package
-else:exists($$PWD/WebCore/generated): CONFIG += standalone_package
+CONFIG(QTDIR_build) {
+ CONFIG += standalone_package
+ # Make sure we compile both debug and release on mac when inside Qt.
+ # This line was extracted from qbase.pri instead of including the whole file
+ win32|mac:!macx-xcode:CONFIG += debug_and_release
+} else {
+ !CONFIG(release, debug|release) {
+ OBJECTS_DIR = obj/debug
+ } else { # Release
+ OBJECTS_DIR = obj/release
+ DEFINES *= NDEBUG
+ }
+ exists($$PWD/WebCore/generated):CONFIG += standalone_package
+ # Make sure that build_all follows the build_all config in WebCore
+ mac:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework):!build_pass:CONFIG += build_all
+}
+
+CONFIG(standalone_package): DEFINES *= NDEBUG
CONFIG += depend_includepath
DEPENDPATH += $$OUT_PWD
INCLUDEPATH += $$PWD/WebKit2/
}
+# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
+win32-g++* {
+ TMPPATH = $$quote($$(INCLUDE))
+ QMAKE_INCDIR_POST += $$split(TMPPATH,";")
+ TMPPATH = $$quote($$(LIB))
+ QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
+}
+
CONFIG -= warn_on
*-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS
!contains(QT_CONFIG, modular) {
- $$QT.phonon.includes = $QMAKE_INCDIR_QT/phonon
- $$QT.phonon.libs = $$QMAKE_LIBDIR_QT
+ QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon
+ QT.phonon.libs = $$QMAKE_LIBDIR_QT
}
# Disable a few warnings on Windows. The warnings are also
+2011-03-01 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Clean up the project files and move common options to WebKit.pri.
+
+ * QtWebKit.pro: Move common options to WebKit.pri.
+
2011-03-01 Aparna Nandyal <aparna.nand@wipro.com>
Reviewed by Simon Hausmann.
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../JavaScriptCore/generated
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../WebCore/generated
isEmpty(WC_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = ../../WebKit2/generated
-
- !CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
- } else { # Release
- OBJECTS_DIR = obj/release
- }
}
include($$PWD/Api/headers.pri)
+2011-03-01 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Clean up the project files and move common options to WebKit.pri.
+
+ * WebKit2.pro: Deduplicate options.
+
2011-03-01 Juha Savolainen <juha.savolainen@weego.fi>
Reviewed by Andreas Kling.
TARGET = $$WEBKIT2_TARGET
DESTDIR = $$WEBKIT2_DESTDIR
-!CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
-} else { # Release
- OBJECTS_DIR = obj/release
- DEFINES += NDEBUG
-}
-
# Build both debug and release configurations
mac: CONFIG += build_all
+2011-03-01 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Clean up the project files and move common options to WebKit.pri.
+
+ * WebKitTestRunner/qt/WebKitTestRunner.pro: Deduplicate.
+
+
2011-03-01 Adam Roben <aroben@apple.com>
Skip another multiprocessing test on Windows
include(../../../Source/WebKit.pri)
-!CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
-} else { # Release
- OBJECTS_DIR = obj/release
-}
-
DEFINES += USE_SYSTEM_MALLOC=1
INCLUDEPATH += \
git://git.webkit.org / WebKit-https.git / commitdiff